diff options
author | Martin Braun <martin.braun@ettus.com> | 2019-01-29 17:21:17 +0100 |
---|---|---|
committer | Martin Braun <martin.braun@ettus.com> | 2019-02-15 11:12:54 -0800 |
commit | 52138314a4daa8140b4dabca5ca4a9ffc6a8ff84 (patch) | |
tree | 6f3f81880da4e6a0efa05908662ad6d4fdefd239 /host/lib/usrp/n230 | |
parent | 5758533839a411906f70e29975a9e9ad2926fe89 (diff) | |
download | uhd-52138314a4daa8140b4dabca5ca4a9ffc6a8ff84.tar.gz uhd-52138314a4daa8140b4dabca5ca4a9ffc6a8ff84.tar.bz2 uhd-52138314a4daa8140b4dabca5ca4a9ffc6a8ff84.zip |
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.
Diffstat (limited to 'host/lib/usrp/n230')
-rw-r--r-- | host/lib/usrp/n230/n230_clk_pps_ctrl.hpp | 4 | ||||
-rw-r--r-- | host/lib/usrp/n230/n230_cores.hpp | 2 | ||||
-rw-r--r-- | host/lib/usrp/n230/n230_eeprom_manager.hpp | 2 | ||||
-rw-r--r-- | host/lib/usrp/n230/n230_frontend_ctrl.hpp | 4 | ||||
-rw-r--r-- | host/lib/usrp/n230/n230_resource_manager.hpp | 4 | ||||
-rw-r--r-- | host/lib/usrp/n230/n230_stream_manager.hpp | 2 | ||||
-rw-r--r-- | host/lib/usrp/n230/n230_uart.hpp | 4 |
7 files changed, 11 insertions, 11 deletions
diff --git a/host/lib/usrp/n230/n230_clk_pps_ctrl.hpp b/host/lib/usrp/n230/n230_clk_pps_ctrl.hpp index af9ffc307..f0ed316cf 100644 --- a/host/lib/usrp/n230/n230_clk_pps_ctrl.hpp +++ b/host/lib/usrp/n230/n230_clk_pps_ctrl.hpp @@ -14,12 +14,12 @@ #include <uhdlib/usrp/cores/time_core_3000.hpp> #include <uhdlib/usrp/common/ad9361_ctrl.hpp> #include <boost/shared_ptr.hpp> -#include <boost/utility.hpp> +#include <uhd/utils/noncopyable.hpp> #include <vector> namespace uhd { namespace usrp { namespace n230 { -class n230_clk_pps_ctrl : boost::noncopyable +class n230_clk_pps_ctrl : uhd::noncopyable { public: typedef boost::shared_ptr<n230_clk_pps_ctrl> sptr; diff --git a/host/lib/usrp/n230/n230_cores.hpp b/host/lib/usrp/n230/n230_cores.hpp index 2768ada41..b37a6c1ef 100644 --- a/host/lib/usrp/n230/n230_cores.hpp +++ b/host/lib/usrp/n230/n230_cores.hpp @@ -14,7 +14,7 @@ namespace uhd { namespace usrp { namespace n230 { -class n230_core_spi_core : boost::noncopyable, public uhd::spi_iface { +class n230_core_spi_core : uhd::noncopyable, public uhd::spi_iface { public: typedef boost::shared_ptr<n230_core_spi_core> sptr; diff --git a/host/lib/usrp/n230/n230_eeprom_manager.hpp b/host/lib/usrp/n230/n230_eeprom_manager.hpp index cc51f3747..72735916f 100644 --- a/host/lib/usrp/n230/n230_eeprom_manager.hpp +++ b/host/lib/usrp/n230/n230_eeprom_manager.hpp @@ -16,7 +16,7 @@ namespace uhd { namespace usrp { namespace n230 { -class n230_eeprom_manager : boost::noncopyable +class n230_eeprom_manager : uhd::noncopyable { public: n230_eeprom_manager(const std::string& addr); diff --git a/host/lib/usrp/n230/n230_frontend_ctrl.hpp b/host/lib/usrp/n230/n230_frontend_ctrl.hpp index 842814213..d8b376831 100644 --- a/host/lib/usrp/n230/n230_frontend_ctrl.hpp +++ b/host/lib/usrp/n230/n230_frontend_ctrl.hpp @@ -14,7 +14,7 @@ #include <uhdlib/usrp/common/ad9361_ctrl.hpp> #include <uhd/types/sensors.hpp> #include <boost/shared_ptr.hpp> -#include <boost/utility.hpp> +#include <uhd/utils/noncopyable.hpp> #include <vector> namespace uhd { namespace usrp { namespace n230 { @@ -28,7 +28,7 @@ enum self_test_mode_t { }; -class n230_frontend_ctrl : boost::noncopyable +class n230_frontend_ctrl : uhd::noncopyable { public: typedef boost::shared_ptr<n230_frontend_ctrl> sptr; diff --git a/host/lib/usrp/n230/n230_resource_manager.hpp b/host/lib/usrp/n230/n230_resource_manager.hpp index 4b4065e8f..ed3bbcb0c 100644 --- a/host/lib/usrp/n230/n230_resource_manager.hpp +++ b/host/lib/usrp/n230/n230_resource_manager.hpp @@ -71,7 +71,7 @@ enum n230_data_dir_t { }; //Radio resources -class radio_resource_t : public boost::noncopyable { +class radio_resource_t : public uhd::noncopyable { public: radio_ctrl_core_3000::sptr ctrl; gpio_atr::gpio_atr_3000::sptr gpio_atr; @@ -83,7 +83,7 @@ public: user_settings_core_3000::sptr user_settings; }; -class n230_resource_manager : public boost::noncopyable +class n230_resource_manager : public uhd::noncopyable { public: //Methods n230_resource_manager(const std::vector<std::string> ip_addrs, const bool safe_mode); diff --git a/host/lib/usrp/n230/n230_stream_manager.hpp b/host/lib/usrp/n230/n230_stream_manager.hpp index 6ec219f0b..fcb00bd51 100644 --- a/host/lib/usrp/n230/n230_stream_manager.hpp +++ b/host/lib/usrp/n230/n230_stream_manager.hpp @@ -25,7 +25,7 @@ namespace uhd { namespace usrp { namespace n230 { -class n230_stream_manager : public boost::noncopyable +class n230_stream_manager : public uhd::noncopyable { public: //Methods n230_stream_manager( diff --git a/host/lib/usrp/n230/n230_uart.hpp b/host/lib/usrp/n230/n230_uart.hpp index 1a90ca928..b1b60a21d 100644 --- a/host/lib/usrp/n230/n230_uart.hpp +++ b/host/lib/usrp/n230/n230_uart.hpp @@ -12,10 +12,10 @@ #include <uhd/types/serial.hpp> //uart iface #include <uhd/utils/tasks.hpp> #include <boost/shared_ptr.hpp> -#include <boost/utility.hpp> +#include <uhd/utils/noncopyable.hpp> namespace uhd { namespace usrp { namespace n230 { -class n230_uart: boost::noncopyable, public uhd::uart_iface +class n230_uart: uhd::noncopyable, public uhd::uart_iface { public: typedef boost::shared_ptr<n230_uart> sptr; |