diff options
| author | Martin Braun <martin.braun@ettus.com> | 2019-01-28 14:54:54 +0100 |
|---|---|---|
| committer | Martin Braun <martin.braun@ettus.com> | 2019-02-15 11:12:54 -0800 |
| commit | 3d726342ff5f0eef8c82496c0d0df771c715cfd0 (patch) | |
| tree | e69377923506ee55d7f275bed52c29deca20c0e8 /host/lib/usrp/b200 | |
| parent | ed97ce3242176f44704216581d23547c302a238c (diff) | |
| download | uhd-3d726342ff5f0eef8c82496c0d0df771c715cfd0.tar.gz uhd-3d726342ff5f0eef8c82496c0d0df771c715cfd0.tar.bz2 uhd-3d726342ff5f0eef8c82496c0d0df771c715cfd0.zip | |
b200: Use uhd::noncopyable
This removes the usage of boost::noncopyable in some places and serves
as a reference for how to do that.
Diffstat (limited to 'host/lib/usrp/b200')
| -rw-r--r-- | host/lib/usrp/b200/b200_cores.hpp | 4 | ||||
| -rw-r--r-- | host/lib/usrp/b200/b200_uart.hpp | 5 |
2 files changed, 6 insertions, 3 deletions
diff --git a/host/lib/usrp/b200/b200_cores.hpp b/host/lib/usrp/b200/b200_cores.hpp index 4d327f8f6..7b5484831 100644 --- a/host/lib/usrp/b200/b200_cores.hpp +++ b/host/lib/usrp/b200/b200_cores.hpp @@ -1,6 +1,7 @@ // // Copyright 2013-2014 Ettus Research LLC // Copyright 2018 Ettus Research, a National Instruments Company +// Copyright 2019 Ettus Research, a National Instruments Brand // // SPDX-License-Identifier: GPL-3.0-or-later // @@ -8,11 +9,12 @@ #ifndef INCLUDED_B200_CORES_HPP #define INCLUDED_B200_CORES_HPP +#include <uhd/utils/noncopyable.hpp> #include <uhdlib/usrp/cores/spi_core_3000.hpp> #include <uhdlib/usrp/common/adf4001_ctrl.hpp> #include <boost/thread/mutex.hpp> -class b200_local_spi_core : boost::noncopyable, public uhd::spi_iface { +class b200_local_spi_core : uhd::noncopyable, public uhd::spi_iface { public: typedef boost::shared_ptr<b200_local_spi_core> sptr; diff --git a/host/lib/usrp/b200/b200_uart.hpp b/host/lib/usrp/b200/b200_uart.hpp index 980b6a918..25dc1171e 100644 --- a/host/lib/usrp/b200/b200_uart.hpp +++ b/host/lib/usrp/b200/b200_uart.hpp @@ -1,6 +1,7 @@ // // Copyright 2013 Ettus Research LLC // Copyright 2018 Ettus Research, a National Instruments Company +// Copyright 2019 Ettus Research, a National Instruments Brand // // SPDX-License-Identifier: GPL-3.0-or-later // @@ -10,10 +11,10 @@ #include <uhd/transport/zero_copy.hpp> #include <uhd/types/serial.hpp> //uart iface +#include <uhd/utils/noncopyable.hpp> #include <boost/shared_ptr.hpp> -#include <boost/utility.hpp> -class b200_uart: boost::noncopyable, public uhd::uart_iface +class b200_uart: uhd::noncopyable, public uhd::uart_iface { public: typedef boost::shared_ptr<b200_uart> sptr; |