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/usrp/common/ad9361_ctrl.hpp | 2 +-
 host/lib/include/uhdlib/usrp/common/fx2_ctrl.hpp    | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'host/lib/include/uhdlib/usrp/common')

diff --git a/host/lib/include/uhdlib/usrp/common/ad9361_ctrl.hpp b/host/lib/include/uhdlib/usrp/common/ad9361_ctrl.hpp
index 30c3987e1..99d74d80f 100644
--- a/host/lib/include/uhdlib/usrp/common/ad9361_ctrl.hpp
+++ b/host/lib/include/uhdlib/usrp/common/ad9361_ctrl.hpp
@@ -37,7 +37,7 @@ namespace uhd { namespace usrp {
  *
  * Frontend numbering is as designed by the AD9361.
  */
-class ad9361_ctrl : public boost::noncopyable
+class ad9361_ctrl : public uhd::noncopyable
 {
 public:
     typedef boost::shared_ptr<ad9361_ctrl> sptr;
diff --git a/host/lib/include/uhdlib/usrp/common/fx2_ctrl.hpp b/host/lib/include/uhdlib/usrp/common/fx2_ctrl.hpp
index 258aa7d04..6aafa885b 100644
--- a/host/lib/include/uhdlib/usrp/common/fx2_ctrl.hpp
+++ b/host/lib/include/uhdlib/usrp/common/fx2_ctrl.hpp
@@ -10,8 +10,8 @@
 
 #include <uhd/transport/usb_control.hpp>
 #include <uhd/types/serial.hpp> //i2c iface
+#include <uhd/utils/noncopyable.hpp>
 #include <boost/shared_ptr.hpp>
-#include <boost/utility.hpp>
 
 #define FL_BEGIN               0
 #define FL_END                 2
@@ -32,7 +32,7 @@
 
 namespace uhd{ namespace usrp{
 
-class fx2_ctrl : boost::noncopyable, public uhd::i2c_iface{
+class fx2_ctrl : uhd::noncopyable, public uhd::i2c_iface{
 public:
     typedef boost::shared_ptr<fx2_ctrl> sptr;
 
-- 
cgit v1.2.3