diff options
| author | Josh Blum <josh@joshknows.com> | 2010-06-07 22:12:01 +0000 |
|---|---|---|
| committer | Josh Blum <josh@joshknows.com> | 2010-06-07 22:12:01 +0000 |
| commit | e4fca26ed44ad3a123c608c8e6cd191c7ea1accf (patch) | |
| tree | 297edda216aa132e6a98a34d646855078c7984cd /host/lib/transport | |
| parent | 8329c5eafc486c9eec6edabbdc2533436127c252 (diff) | |
| parent | 11e2d407ce4a45da8c6981abfd34883cb9174840 (diff) | |
| download | uhd-e4fca26ed44ad3a123c608c8e6cd191c7ea1accf.tar.gz uhd-e4fca26ed44ad3a123c608c8e6cd191c7ea1accf.tar.bz2 uhd-e4fca26ed44ad3a123c608c8e6cd191c7ea1accf.zip | |
Merge branch 'work' of ettus.sourcerepo.com:ettus/uhdpriv into usrp_e
Diffstat (limited to 'host/lib/transport')
| -rw-r--r-- | host/lib/transport/convert_types.cpp | 3 | ||||
| -rwxr-xr-x | host/lib/transport/gen_vrt.py | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/host/lib/transport/convert_types.cpp b/host/lib/transport/convert_types.cpp index 43503025a..374479eee 100644 --- a/host/lib/transport/convert_types.cpp +++ b/host/lib/transport/convert_types.cpp @@ -20,6 +20,7 @@ #include <uhd/utils/assert.hpp> #include <boost/asio.hpp> //endianness conversion #include <boost/cstdint.hpp> +#include <boost/detail/endian.hpp> #include <complex> using namespace uhd; @@ -44,7 +45,7 @@ static const float floats_per_short = float(1.0/shorts_per_float); } // set a boolean flag that indicates the endianess -#ifdef HAVE_BIG_ENDIAN +#ifdef BOOST_BIG_ENDIAN static const bool is_big_endian = true; #else static const bool is_big_endian = false; diff --git a/host/lib/transport/gen_vrt.py b/host/lib/transport/gen_vrt.py index 1417240ab..3279ae225 100755 --- a/host/lib/transport/gen_vrt.py +++ b/host/lib/transport/gen_vrt.py @@ -33,10 +33,11 @@ TMPL_TEXT = """ \#include <uhd/transport/vrt.hpp> \#include <uhd/utils/byteswap.hpp> +\#include <boost/detail/endian.hpp> \#include <stdexcept> //define the endian macros to convert integers -\#ifdef HAVE_BIG_ENDIAN +\#ifdef BOOST_BIG_ENDIAN \#define BE_MACRO(x) (x) \#define LE_MACRO(x) uhd::byteswap(x) \#else |