diff options
| author | Josh Blum <josh@joshknows.com> | 2010-04-28 11:10:50 -0700 |
|---|---|---|
| committer | Josh Blum <josh@joshknows.com> | 2010-04-28 11:10:50 -0700 |
| commit | cbd9e1da0866893d86320787a99cf4257478c539 (patch) | |
| tree | 0b2515cd96d9c341795b91efed25df0616ea821c /host/lib/transport | |
| parent | f5b6776a0b642c0357fbecdead9d2b1ac6ece3d3 (diff) | |
| parent | 8497eb2ac016f72e2b9a9028e5126bc73f5b0c9a (diff) | |
| download | uhd-cbd9e1da0866893d86320787a99cf4257478c539.tar.gz uhd-cbd9e1da0866893d86320787a99cf4257478c539.tar.bz2 uhd-cbd9e1da0866893d86320787a99cf4257478c539.zip | |
Merge branch 'master' of git@ettus.sourcerepo.com:ettus/uhdpriv into usrp_e
Diffstat (limited to 'host/lib/transport')
| -rw-r--r-- | host/lib/transport/convert_types.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/host/lib/transport/convert_types.cpp b/host/lib/transport/convert_types.cpp index 2a6854f50..8c3d6b17a 100644 --- a/host/lib/transport/convert_types.cpp +++ b/host/lib/transport/convert_types.cpp @@ -19,6 +19,7 @@ #include <uhd/utils/assert.hpp> #include <boost/asio.hpp> //endianness conversion #include <boost/cstdint.hpp> +#include <complex> using namespace uhd; @@ -109,7 +110,7 @@ void transport::convert_io_type_to_otw_type( size_t num_samps ){ //all we handle for now: - ASSERT_THROW(otw_type.width == 16 and otw_type.byteorder == otw_type_t::BO_BIG_ENDIAN); + UHD_ASSERT_THROW(otw_type.width == 16 and otw_type.byteorder == otw_type_t::BO_BIG_ENDIAN); switch(io_type.tid){ case io_type_t::COMPLEX_FLOAT32: @@ -129,7 +130,7 @@ void transport::convert_otw_type_to_io_type( size_t num_samps ){ //all we handle for now: - ASSERT_THROW(otw_type.width == 16 and otw_type.byteorder == otw_type_t::BO_BIG_ENDIAN); + UHD_ASSERT_THROW(otw_type.width == 16 and otw_type.byteorder == otw_type_t::BO_BIG_ENDIAN); switch(io_type.tid){ case io_type_t::COMPLEX_FLOAT32: |