aboutsummaryrefslogtreecommitdiffstats
path: root/host/lib
diff options
context:
space:
mode:
authorMoritz Fischer <moritz.fischer@ettus.com>2015-03-12 10:43:13 -0700
committerMartin Braun <martin.braun@ettus.com>2015-03-12 12:10:26 -0700
commitd1ca5a10a1c79092ca5b20f52989d6e8b81306c0 (patch)
treec7f2ade8a3adb0cd3c015b0ad8a3e3e12bd5cf33 /host/lib
parentcc7d37f114d5a14b4e45372f38324bf95115b6b9 (diff)
downloaduhd-d1ca5a10a1c79092ca5b20f52989d6e8b81306c0.tar.gz
uhd-d1ca5a10a1c79092ca5b20f52989d6e8b81306c0.tar.bz2
uhd-d1ca5a10a1c79092ca5b20f52989d6e8b81306c0.zip
e300: Fix missing namespace prefixes.
In several files we were lacking boost:: namespace prefixes, which led to build failures on certain configurations. Signed-off-by: Moritz Fischer <moritz.fischer@ettus.com>
Diffstat (limited to 'host/lib')
-rw-r--r--host/lib/usrp/e300/e300_eeprom_manager.cpp4
-rw-r--r--host/lib/usrp/e300/e300_sensor_manager.hpp2
-rw-r--r--host/lib/usrp/e300/e300_spi.cpp6
3 files changed, 6 insertions, 6 deletions
diff --git a/host/lib/usrp/e300/e300_eeprom_manager.cpp b/host/lib/usrp/e300/e300_eeprom_manager.cpp
index dad6741f5..778e3150c 100644
--- a/host/lib/usrp/e300/e300_eeprom_manager.cpp
+++ b/host/lib/usrp/e300/e300_eeprom_manager.cpp
@@ -21,7 +21,7 @@
namespace uhd { namespace usrp { namespace e300 {
-static const std::string _bytes_to_string(const uint8_t* bytes, size_t max_len)
+static const std::string _bytes_to_string(const boost::uint8_t* bytes, size_t max_len)
{
std::string out;
for (size_t i = 0; i < max_len; i++) {
@@ -31,7 +31,7 @@ static const std::string _bytes_to_string(const uint8_t* bytes, size_t max_len)
return out;
}
-static void _string_to_bytes(const std::string &string, size_t max_len, uint8_t* buffer)
+static void _string_to_bytes(const std::string &string, size_t max_len, boost::uint8_t* buffer)
{
byte_vector_t bytes;
const size_t len = std::min(string.size(), max_len);
diff --git a/host/lib/usrp/e300/e300_sensor_manager.hpp b/host/lib/usrp/e300/e300_sensor_manager.hpp
index 9c060b19a..09f889251 100644
--- a/host/lib/usrp/e300/e300_sensor_manager.hpp
+++ b/host/lib/usrp/e300/e300_sensor_manager.hpp
@@ -62,7 +62,7 @@ public:
// Note: This is a hack
static boost::uint32_t pack_float_in_uint32_t(const float &v)
{
- const boost::uint32_t *cast = reinterpret_cast<const uint32_t*>(&v);
+ const boost::uint32_t *cast = reinterpret_cast<const boost::uint32_t*>(&v);
return *cast;
}
diff --git a/host/lib/usrp/e300/e300_spi.cpp b/host/lib/usrp/e300/e300_spi.cpp
index 9a2daf4a7..2722d7f53 100644
--- a/host/lib/usrp/e300/e300_spi.cpp
+++ b/host/lib/usrp/e300/e300_spi.cpp
@@ -82,13 +82,13 @@ public:
int ret(0);
struct spi_ioc_transfer tr;
- uint8_t *tx_data = reinterpret_cast<uint8_t *>(&data);
+ boost::uint8_t *tx_data = reinterpret_cast<boost::uint8_t *>(&data);
UHD_ASSERT_THROW(num_bits == 24);
- uint8_t tx[] = {tx_data[2], tx_data[1], tx_data[0]};
+ boost::uint8_t tx[] = {tx_data[2], tx_data[1], tx_data[0]};
- uint8_t rx[3];
+ boost::uint8_t rx[3];
tr.tx_buf = (unsigned long) &tx[0];
tr.rx_buf = (unsigned long) &rx[0];
tr.len = num_bits >> 3;