diff options
| author | Martin Braun <martin.braun@ettus.com> | 2019-01-14 13:49:05 -0800 |
|---|---|---|
| committer | Brent Stapleton <brent.stapleton@ettus.com> | 2019-01-21 14:00:34 -0800 |
| commit | b459e02eedf358ef564020d698a9d96b711bf14e (patch) | |
| tree | 6319539db3d01787975c74794cdcf60ebfa948a8 /host/lib | |
| parent | 764c5cd8087b560d4ef36679c82f7f8b25a6642b (diff) | |
| download | uhd-b459e02eedf358ef564020d698a9d96b711bf14e.tar.gz uhd-b459e02eedf358ef564020d698a9d96b711bf14e.tar.bz2 uhd-b459e02eedf358ef564020d698a9d96b711bf14e.zip | |
endianness: Replace Boost macros with custom ones
Boost changed the macros for endianness identification in 1.69, and the
deprecation warning is a pretty noisy one during compilation. This
abstracts away the Boost macro, so we have two UHD macros,
UHD_BIG_ENDIAN and UHD_LITTLE_ENDIAN. They indicate big and little
endian byte order.
Diffstat (limited to 'host/lib')
| -rw-r--r-- | host/lib/convert/convert_with_tables.cpp | 2 | ||||
| -rw-r--r-- | host/lib/transport/chdr.cpp | 2 | ||||
| -rw-r--r-- | host/lib/transport/gen_vrt_if_packet.py | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/host/lib/convert/convert_with_tables.cpp b/host/lib/convert/convert_with_tables.cpp index 40efc5190..5c9248052 100644 --- a/host/lib/convert/convert_with_tables.cpp +++ b/host/lib/convert/convert_with_tables.cpp @@ -168,7 +168,7 @@ private: * Factory functions and registration **********************************************************************/ -#ifdef BOOST_BIG_ENDIAN +#ifdef UHD_BIG_ENDIAN # define SHIFT_PAIR0 16, 0 # define SHIFT_PAIR1 0, 16 # define BE_SWAP false diff --git a/host/lib/transport/chdr.cpp b/host/lib/transport/chdr.cpp index ff3b6475a..312cca318 100644 --- a/host/lib/transport/chdr.cpp +++ b/host/lib/transport/chdr.cpp @@ -10,7 +10,7 @@ #include <uhd/utils/byteswap.hpp> // define the endian macros to convert integers -#ifdef BOOST_BIG_ENDIAN +#ifdef UHD_BIG_ENDIAN # define BE_MACRO(x) (x) # define LE_MACRO(x) uhd::byteswap(x) #else diff --git a/host/lib/transport/gen_vrt_if_packet.py b/host/lib/transport/gen_vrt_if_packet.py index 225a59dfe..6a17d9e3b 100644 --- a/host/lib/transport/gen_vrt_if_packet.py +++ b/host/lib/transport/gen_vrt_if_packet.py @@ -23,11 +23,11 @@ TMPL_TEXT = """<% import time %> #include <uhd/exception.hpp> #include <uhd/transport/vrt_if_packet.hpp> #include <uhd/utils/byteswap.hpp> -#include <boost/detail/endian.hpp> +#include <uhd/types/endianness.hpp> #include <vector> //define the endian macros to convert integers -#ifdef BOOST_BIG_ENDIAN +#ifdef UHD_BIG_ENDIAN #define BE_MACRO(x) (x) #define LE_MACRO(x) uhd::byteswap(x) #else |