From 52138314a4daa8140b4dabca5ca4a9ffc6a8ff84 Mon Sep 17 00:00:00 2001
From: Martin Braun <martin.braun@ettus.com>
Date: Tue, 29 Jan 2019 17:21:17 +0100
Subject: uhd: Replace all usage of boost::noncopyable with uhd::noncopyable

This fixes the build errors that occur due to switching locations of
noncopyable.hpp within Boost, and also allows us to remove
boost::noncopyable in one fell swoop.
---
 host/lib/include/uhdlib/experts/expert_container.hpp | 4 ++--
 host/lib/include/uhdlib/experts/expert_factory.hpp   | 4 ++--
 host/lib/include/uhdlib/experts/expert_nodes.hpp     | 8 ++------
 3 files changed, 6 insertions(+), 10 deletions(-)

(limited to 'host/lib/include/uhdlib/experts')

diff --git a/host/lib/include/uhdlib/experts/expert_container.hpp b/host/lib/include/uhdlib/experts/expert_container.hpp
index c50e45847..5c8df5f1a 100644
--- a/host/lib/include/uhdlib/experts/expert_container.hpp
+++ b/host/lib/include/uhdlib/experts/expert_container.hpp
@@ -10,7 +10,7 @@
 
 #include <uhdlib/experts/expert_nodes.hpp>
 #include <uhd/config.hpp>
-#include <boost/noncopyable.hpp>
+#include <uhd/utils/noncopyable.hpp>
 #include <boost/shared_ptr.hpp>
 #include <boost/thread/recursive_mutex.hpp>
 
@@ -23,7 +23,7 @@ namespace uhd { namespace experts {
         AUTO_RESOLVE_ON_READ_WRITE
     };
 
-    class UHD_API expert_container : private boost::noncopyable, public node_retriever_t {
+    class UHD_API expert_container : private uhd::noncopyable, public node_retriever_t {
     public: //Methods
         typedef boost::shared_ptr<expert_container> sptr;
 
diff --git a/host/lib/include/uhdlib/experts/expert_factory.hpp b/host/lib/include/uhdlib/experts/expert_factory.hpp
index 72798eccc..e7164e00e 100644
--- a/host/lib/include/uhdlib/experts/expert_factory.hpp
+++ b/host/lib/include/uhdlib/experts/expert_factory.hpp
@@ -11,7 +11,7 @@
 #include <uhdlib/experts/expert_container.hpp>
 #include <uhd/property_tree.hpp>
 #include <uhd/config.hpp>
-#include <boost/noncopyable.hpp>
+#include <uhd/utils/noncopyable.hpp>
 #include <boost/bind.hpp>
 #include <memory>
 
@@ -28,7 +28,7 @@ namespace uhd { namespace experts {
      * storage on destruction.
      *
      */
-    class UHD_API expert_factory : public boost::noncopyable {
+    class UHD_API expert_factory : public uhd::noncopyable {
     public:
 
         /*!
diff --git a/host/lib/include/uhdlib/experts/expert_nodes.hpp b/host/lib/include/uhdlib/experts/expert_nodes.hpp
index 1aa29b3a3..e698b3a71 100644
--- a/host/lib/include/uhdlib/experts/expert_nodes.hpp
+++ b/host/lib/include/uhdlib/experts/expert_nodes.hpp
@@ -11,12 +11,8 @@
 #include <uhd/config.hpp>
 #include <uhd/exception.hpp>
 #include <uhd/utils/dirty_tracked.hpp>
+#include <uhd/utils/noncopyable.hpp>
 #include <uhd/types/time_spec.hpp>
-#if BOOST_VERSION >= 105600
-#include <boost/core/noncopyable.hpp>
-#else
-#include <boost/noncopyable.hpp>
-#endif
 #include <boost/function.hpp>
 #include <boost/thread/recursive_mutex.hpp>
 #include <boost/thread.hpp>
@@ -38,7 +34,7 @@ namespace uhd { namespace experts {
      * graph. Data nodes and workers are derived from this class.
      * ---------------------------------------------------------
      */
-    class dag_vertex_t : private boost::noncopyable {
+    class dag_vertex_t : private uhd::noncopyable {
     public:
         typedef boost::function<void(std::string)> callback_func_t;
 
-- 
cgit v1.2.3