aboutsummaryrefslogtreecommitdiffstats
path: root/host
diff options
context:
space:
mode:
Diffstat (limited to 'host')
-rw-r--r--host/include/uhd/types/endianness.hpp28
-rw-r--r--host/include/uhd/utils/noncopyable.hpp6
-rw-r--r--host/lib/include/uhdlib/usrp/cores/gpio_atr_3000.hpp5
3 files changed, 7 insertions, 32 deletions
diff --git a/host/include/uhd/types/endianness.hpp b/host/include/uhd/types/endianness.hpp
index b74564415..9f9125332 100644
--- a/host/include/uhd/types/endianness.hpp
+++ b/host/include/uhd/types/endianness.hpp
@@ -13,32 +13,16 @@
/******************************************************************************
* Detect host endianness
*****************************************************************************/
-#if BOOST_VERSION >= 105500
-
-# include <boost/predef/other/endian.h>
+#include <boost/predef/other/endian.h>
// In Boost 1.55, the meaning of the macros changed. They are now always
// defined, but don't always have the same value.
-# if BOOST_ENDIAN_BIG_BYTE
-# define UHD_BIG_ENDIAN
-# elif BOOST_ENDIAN_LITTLE_BYTE
-# define UHD_LITTLE_ENDIAN
-# else
-# error "Unsupported endianness!"
-# endif
-
+#if BOOST_ENDIAN_BIG_BYTE
+# define UHD_BIG_ENDIAN
+#elif BOOST_ENDIAN_LITTLE_BYTE
+# define UHD_LITTLE_ENDIAN
#else
-
-# include <boost/detail/endian.hpp>
-
-# if defined(BOOST_BIG_ENDIAN)
-# define UHD_BIG_ENDIAN
-# elif defined(BOOST_LITTLE_ENDIAN)
-# define UHD_LITTLE_ENDIAN
-# else
-# error "Unsupported endianness!"
-# endif
-
+# error "Unsupported endianness!"
#endif
diff --git a/host/include/uhd/utils/noncopyable.hpp b/host/include/uhd/utils/noncopyable.hpp
index 0f480f6c3..b2aabdcec 100644
--- a/host/include/uhd/utils/noncopyable.hpp
+++ b/host/include/uhd/utils/noncopyable.hpp
@@ -41,11 +41,7 @@ public:
#else
-# if BOOST_VERSION >= 105600
-# include <boost/core/noncopyable.hpp>
-# else
-# include <boost/noncopyable.hpp>
-# endif
+# include <boost/core/noncopyable.hpp>
namespace uhd {
typedef boost::noncopyable noncopyable;
}
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 76f9e0fb9..4d2baf800 100644
--- a/host/lib/include/uhdlib/usrp/cores/gpio_atr_3000.hpp
+++ b/host/lib/include/uhdlib/usrp/cores/gpio_atr_3000.hpp
@@ -15,11 +15,6 @@
#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 {