diff options
| author | Michael Dickens <michael.dickens@ettus.com> | 2019-02-11 11:34:52 -0500 |
|---|---|---|
| committer | Brent Stapleton <brent.stapleton@ettus.com> | 2019-02-11 13:57:50 -0800 |
| commit | 93ca7c4d3c46a88feccc3faa8d923b1d0f10e281 (patch) | |
| tree | d53268c74f7a71f6678d47775305bb685894da19 | |
| parent | 4eb12b031f9cad3df3e294db466bd26dee6b78e1 (diff) | |
| download | uhd-93ca7c4d3c46a88feccc3faa8d923b1d0f10e281.tar.gz uhd-93ca7c4d3c46a88feccc3faa8d923b1d0f10e281.tar.bz2 uhd-93ca7c4d3c46a88feccc3faa8d923b1d0f10e281.zip | |
lib: fix includes for boost::noncopyable
- expert_nodes.hpp: fix to work with BOOST_VERSION < 105600, since UHD
still supports Boost 1.53.00.
- gpio_atr_3000.hpp: requires boost::noncopyable header, so replicate
that (now) in export_nodes.hpp.
| -rw-r--r-- | host/lib/include/uhdlib/experts/expert_nodes.hpp | 2 | ||||
| -rw-r--r-- | host/lib/include/uhdlib/usrp/cores/gpio_atr_3000.hpp | 5 |
2 files changed, 7 insertions, 0 deletions
diff --git a/host/lib/include/uhdlib/experts/expert_nodes.hpp b/host/lib/include/uhdlib/experts/expert_nodes.hpp index a540fc49d..1aa29b3a3 100644 --- a/host/lib/include/uhdlib/experts/expert_nodes.hpp +++ b/host/lib/include/uhdlib/experts/expert_nodes.hpp @@ -14,6 +14,8 @@ #include <uhd/types/time_spec.hpp> #if BOOST_VERSION >= 105600 #include <boost/core/noncopyable.hpp> +#else +#include <boost/noncopyable.hpp> #endif #include <boost/function.hpp> #include <boost/thread/recursive_mutex.hpp> diff --git a/host/lib/include/uhdlib/usrp/cores/gpio_atr_3000.hpp b/host/lib/include/uhdlib/usrp/cores/gpio_atr_3000.hpp index 30c7d6fb7..0e0f706b8 100644 --- a/host/lib/include/uhdlib/usrp/cores/gpio_atr_3000.hpp +++ b/host/lib/include/uhdlib/usrp/cores/gpio_atr_3000.hpp @@ -14,6 +14,11 @@ #include <uhdlib/usrp/gpio_defs.hpp> #include <uhd/types/wb_iface.hpp> #include <boost/shared_ptr.hpp> +#if BOOST_VERSION >= 105600 +#include <boost/core/noncopyable.hpp> +#else +#include <boost/noncopyable.hpp> +#endif namespace uhd { namespace usrp { namespace gpio_atr { |