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/usrp/e300/e300_sensor_manager.hpp | |
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/usrp/e300/e300_sensor_manager.hpp')
-rw-r--r-- | host/lib/usrp/e300/e300_sensor_manager.hpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/host/lib/usrp/e300/e300_sensor_manager.hpp b/host/lib/usrp/e300/e300_sensor_manager.hpp index 1252e07b9..c2d31bff7 100644 --- a/host/lib/usrp/e300/e300_sensor_manager.hpp +++ b/host/lib/usrp/e300/e300_sensor_manager.hpp @@ -16,7 +16,7 @@ // #include <boost/noncopyable.hpp> -#include <boost/cstdint.hpp> +#include <stdint.h> #include <uhd/transport/zero_copy.hpp> #include <uhd/types/sensors.hpp> @@ -30,10 +30,10 @@ namespace uhd { namespace usrp { namespace e300 { struct sensor_transaction_t { - boost::uint32_t which; + uint32_t which; union { - boost::uint32_t value; - boost::uint32_t value64; + uint32_t value; + uint32_t value64; }; }; @@ -59,13 +59,13 @@ public: static sptr make_local(global_regs::sptr global_regs); // Note: This is a hack - static boost::uint32_t pack_float_in_uint32_t(const float &v) + static uint32_t pack_float_in_uint32_t(const float &v) { - const boost::uint32_t *cast = reinterpret_cast<const boost::uint32_t*>(&v); + const uint32_t *cast = reinterpret_cast<const uint32_t*>(&v); return *cast; } - static float unpack_float_from_uint32_t(const boost::uint32_t &v) + static float unpack_float_from_uint32_t(const uint32_t &v) { const float *cast = reinterpret_cast<const float*>(&v); return *cast; |