diff options
| author | Martin Braun <martin.braun@ettus.com> | 2018-04-25 15:09:27 -0700 |
|---|---|---|
| committer | Martin Braun <martin.braun@ettus.com> | 2018-04-26 13:14:47 -0700 |
| commit | fb1b7b78687da3653c0461394cee7135e701bfd5 (patch) | |
| tree | 301ba7d15548efcd80fb574d1bef9df410f059f6 /host/lib/include | |
| parent | 96fa9acb7f7cacdb24a7d01715e4f151ed7a6561 (diff) | |
| download | uhd-fb1b7b78687da3653c0461394cee7135e701bfd5.tar.gz uhd-fb1b7b78687da3653c0461394cee7135e701bfd5.tar.bz2 uhd-fb1b7b78687da3653c0461394cee7135e701bfd5.zip | |
ad936x: De-boostify ad936x_manager, minor cleanup
- Remove all use of boost::bind and boost::function
- Demote some log messages to DEBUG
- Change some formatting to match coding guidelines
- B2xx/E310: Match changes in loopback function
Diffstat (limited to 'host/lib/include')
| -rw-r--r-- | host/lib/include/uhdlib/usrp/common/ad9361_ctrl.hpp | 2 | ||||
| -rw-r--r-- | host/lib/include/uhdlib/usrp/common/ad936x_manager.hpp | 5 |
2 files changed, 4 insertions, 3 deletions
diff --git a/host/lib/include/uhdlib/usrp/common/ad9361_ctrl.hpp b/host/lib/include/uhdlib/usrp/common/ad9361_ctrl.hpp index b9e81074b..1acbe6463 100644 --- a/host/lib/include/uhdlib/usrp/common/ad9361_ctrl.hpp +++ b/host/lib/include/uhdlib/usrp/common/ad9361_ctrl.hpp @@ -42,7 +42,7 @@ class ad9361_ctrl : public boost::noncopyable public: typedef boost::shared_ptr<ad9361_ctrl> sptr; - virtual ~ad9361_ctrl(void) {}; + virtual ~ad9361_ctrl(void) {} //! make a new codec control object static sptr make_spi( diff --git a/host/lib/include/uhdlib/usrp/common/ad936x_manager.hpp b/host/lib/include/uhdlib/usrp/common/ad936x_manager.hpp index 7934b1050..7abbe69ed 100644 --- a/host/lib/include/uhdlib/usrp/common/ad936x_manager.hpp +++ b/host/lib/include/uhdlib/usrp/common/ad936x_manager.hpp @@ -16,6 +16,7 @@ #include <boost/format.hpp> #include <boost/shared_ptr.hpp> #include <stdint.h> +#include <functional> namespace uhd { namespace usrp { @@ -71,8 +72,8 @@ public: * \throws a uhd::runtime_error if the loopback value didn't match. */ virtual void loopback_self_test( - boost::function<void(uint32_t)> poker_functor, - boost::function<uint64_t()> peeker_functor + std::function<void(uint32_t)> poker_functor, + std::function<uint64_t()> peeker_functor ) = 0; /*! Determine a tick rate that will work with a given sampling rate |