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/usrp/usrp2/clock_ctrl.hpp | 4 ++--
 host/lib/usrp/usrp2/codec_ctrl.hpp | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'host/lib/usrp/usrp2')

diff --git a/host/lib/usrp/usrp2/clock_ctrl.hpp b/host/lib/usrp/usrp2/clock_ctrl.hpp
index 96a1a0714..53f0d0aef 100644
--- a/host/lib/usrp/usrp2/clock_ctrl.hpp
+++ b/host/lib/usrp/usrp2/clock_ctrl.hpp
@@ -9,11 +9,11 @@
 #define INCLUDED_CLOCK_CTRL_HPP
 
 #include "usrp2_iface.hpp"
+#include <uhd/utils/noncopyable.hpp>
 #include <boost/shared_ptr.hpp>
-#include <boost/utility.hpp>
 #include <vector>
 
-class usrp2_clock_ctrl : boost::noncopyable{
+class usrp2_clock_ctrl : uhd::noncopyable{
 public:
     typedef boost::shared_ptr<usrp2_clock_ctrl> sptr;
 
diff --git a/host/lib/usrp/usrp2/codec_ctrl.hpp b/host/lib/usrp/usrp2/codec_ctrl.hpp
index ac808e357..37c8d6fa3 100644
--- a/host/lib/usrp/usrp2/codec_ctrl.hpp
+++ b/host/lib/usrp/usrp2/codec_ctrl.hpp
@@ -10,9 +10,9 @@
 
 #include "usrp2_iface.hpp"
 #include <boost/shared_ptr.hpp>
-#include <boost/utility.hpp>
+#include <uhd/utils/noncopyable.hpp>
 
-class usrp2_codec_ctrl : boost::noncopyable{
+class usrp2_codec_ctrl : uhd::noncopyable{
 public:
     typedef boost::shared_ptr<usrp2_codec_ctrl> sptr;
 
-- 
cgit v1.2.3