diff options
| author | Martin Braun <martin.braun@ettus.com> | 2015-03-12 12:11:15 -0700 |
|---|---|---|
| committer | Martin Braun <martin.braun@ettus.com> | 2015-03-12 12:11:15 -0700 |
| commit | 04f71c29d27b16ec6a9b37ad18317bf8a3a83112 (patch) | |
| tree | 2ca698516141844352e35b1eed5b292298d39c8e /host/lib/usrp/e300/e300_eeprom_manager.cpp | |
| parent | cc0af39a2234c433ff12d02a7d0f58db3e48b10c (diff) | |
| parent | d1ca5a10a1c79092ca5b20f52989d6e8b81306c0 (diff) | |
| download | uhd-04f71c29d27b16ec6a9b37ad18317bf8a3a83112.tar.gz uhd-04f71c29d27b16ec6a9b37ad18317bf8a3a83112.tar.bz2 uhd-04f71c29d27b16ec6a9b37ad18317bf8a3a83112.zip | |
Merge branch 'maint'
Diffstat (limited to 'host/lib/usrp/e300/e300_eeprom_manager.cpp')
| -rw-r--r-- | host/lib/usrp/e300/e300_eeprom_manager.cpp | 4 |
1 files changed, 2 insertions, 2 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); |