diff options
author | Michael West <michael.west@ettus.com> | 2013-10-28 13:19:36 -0700 |
---|---|---|
committer | Michael West <michael.west@ettus.com> | 2013-10-28 13:19:36 -0700 |
commit | 5ba9932c699fd54bc5955afebbef75dd918f340a (patch) | |
tree | 1cb4bd79eb7a72dc74ac3d408aeb68d7c552cb75 | |
parent | fc6077a07562f6372cc1c7f20eedc0fd54f230fe (diff) | |
download | uhd-5ba9932c699fd54bc5955afebbef75dd918f340a.tar.gz uhd-5ba9932c699fd54bc5955afebbef75dd918f340a.tar.bz2 uhd-5ba9932c699fd54bc5955afebbef75dd918f340a.zip |
Fixed compiler warnings.
-rw-r--r-- | host/lib/usrp/usrp1/usrp1_iface.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/host/lib/usrp/usrp1/usrp1_iface.cpp b/host/lib/usrp/usrp1/usrp1_iface.cpp index 9301721aa..7c64714b7 100644 --- a/host/lib/usrp/usrp1/usrp1_iface.cpp +++ b/host/lib/usrp/usrp1/usrp1_iface.cpp @@ -91,11 +91,11 @@ public: return uhd::ntohx(value_out); } - + void poke16(boost::uint32_t, boost::uint16_t) { throw uhd::not_implemented_error("Unhandled command poke16()"); } - + boost::uint16_t peek16(boost::uint32_t) { throw uhd::not_implemented_error("Unhandled command peek16()"); return 0; @@ -141,8 +141,8 @@ public: if (readback) { unsigned char buff[4] = { - (bits >> 0) & 0xff, (bits >> 8) & 0xff, - (bits >> 16) & 0xff, (bits >> 24) & 0xff + (unsigned char)((bits >> 0) & 0xff), (unsigned char)((bits >> 8) & 0xff), + (unsigned char)((bits >> 16) & 0xff), (unsigned char)((bits >> 24) & 0xff) }; //conditions where there are two header bytes if (num_bytes >= 3 and buff[num_bytes-1] != 0 and buff[num_bytes-2] != 0 and buff[num_bytes-3] == 0){ @@ -168,7 +168,7 @@ public: (((boost::uint32_t)buff[1]) << 8) | (((boost::uint32_t)buff[2]) << 16) | (((boost::uint32_t)buff[3]) << 24); - return val; + return val; } else { // Byteswap on num_bytes |