diff options
author | Martin Braun <martin.braun@ettus.com> | 2016-11-08 08:41:46 -0800 |
---|---|---|
committer | Martin Braun <martin.braun@ettus.com> | 2016-11-08 08:41:46 -0800 |
commit | 9b852f5f243e5cf68662b7152b5fa331a83e55fb (patch) | |
tree | 159ffe0761f78dd87e2ecc97abea14494abab4ff /host/lib/convert/convert_impl.cpp | |
parent | c66cb1bad0d881394f3519bd94f4693cceab4c64 (diff) | |
parent | 99c2730bc9db270560671f2d7d173768465ed51f (diff) | |
download | uhd-9b852f5f243e5cf68662b7152b5fa331a83e55fb.tar.gz uhd-9b852f5f243e5cf68662b7152b5fa331a83e55fb.tar.bz2 uhd-9b852f5f243e5cf68662b7152b5fa331a83e55fb.zip |
Merge branch 'maint'
Diffstat (limited to 'host/lib/convert/convert_impl.cpp')
-rw-r--r-- | host/lib/convert/convert_impl.cpp | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/host/lib/convert/convert_impl.cpp b/host/lib/convert/convert_impl.cpp index 7dfbb33fd..d624bf970 100644 --- a/host/lib/convert/convert_impl.cpp +++ b/host/lib/convert/convert_impl.cpp @@ -20,7 +20,7 @@ #include <uhd/utils/static.hpp> #include <uhd/types/dict.hpp> #include <uhd/exception.hpp> -#include <boost/cstdint.hpp> +#include <stdint.h> #include <boost/format.hpp> #include <boost/foreach.hpp> #include <complex> @@ -159,20 +159,20 @@ UHD_STATIC_BLOCK(convert_register_item_sizes){ //register standard complex types convert::register_bytes_per_item("fc64", sizeof(std::complex<double>)); convert::register_bytes_per_item("fc32", sizeof(std::complex<float>)); - convert::register_bytes_per_item("sc64", sizeof(std::complex<boost::int64_t>)); - convert::register_bytes_per_item("sc32", sizeof(std::complex<boost::int32_t>)); - convert::register_bytes_per_item("sc16", sizeof(std::complex<boost::int16_t>)); - convert::register_bytes_per_item("sc8", sizeof(std::complex<boost::int8_t>)); + convert::register_bytes_per_item("sc64", sizeof(std::complex<int64_t>)); + convert::register_bytes_per_item("sc32", sizeof(std::complex<int32_t>)); + convert::register_bytes_per_item("sc16", sizeof(std::complex<int16_t>)); + convert::register_bytes_per_item("sc8", sizeof(std::complex<int8_t>)); //register standard real types convert::register_bytes_per_item("f64", sizeof(double)); convert::register_bytes_per_item("f32", sizeof(float)); - convert::register_bytes_per_item("s64", sizeof(boost::int64_t)); - convert::register_bytes_per_item("s32", sizeof(boost::int32_t)); - convert::register_bytes_per_item("s16", sizeof(boost::int16_t)); - convert::register_bytes_per_item("s8", sizeof(boost::int8_t)); - convert::register_bytes_per_item("u8", sizeof(boost::uint8_t)); + convert::register_bytes_per_item("s64", sizeof(int64_t)); + convert::register_bytes_per_item("s32", sizeof(int32_t)); + convert::register_bytes_per_item("s16", sizeof(int16_t)); + convert::register_bytes_per_item("s8", sizeof(int8_t)); + convert::register_bytes_per_item("u8", sizeof(uint8_t)); //register VITA types - convert::register_bytes_per_item("item32", sizeof(boost::int32_t)); + convert::register_bytes_per_item("item32", sizeof(int32_t)); } |