diff options
| author | Josh Blum <josh@joshknows.com> | 2010-07-05 21:51:48 -0700 |
|---|---|---|
| committer | Josh Blum <josh@joshknows.com> | 2010-07-05 21:51:48 -0700 |
| commit | 189c4c96fc0b40aa98c28f6bd4b95753bdaec970 (patch) | |
| tree | 0a0e1fe7d852c9ad94334b2aa24322f08b860a66 /host/lib | |
| parent | 4840c5bc95771e8f2485e002da0d81521cb4a16c (diff) | |
| download | uhd-189c4c96fc0b40aa98c28f6bd4b95753bdaec970.tar.gz uhd-189c4c96fc0b40aa98c28f6bd4b95753bdaec970.tar.bz2 uhd-189c4c96fc0b40aa98c28f6bd4b95753bdaec970.zip | |
uhd: remove windows warnings (minor tweaks)
Diffstat (limited to 'host/lib')
| -rw-r--r-- | host/lib/transport/udp_zero_copy_asio.cpp | 2 | ||||
| -rw-r--r-- | host/lib/usrp/usrp2/usrp2_impl.hpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/host/lib/transport/udp_zero_copy_asio.cpp b/host/lib/transport/udp_zero_copy_asio.cpp index a91be25af..7f9292d24 100644 --- a/host/lib/transport/udp_zero_copy_asio.cpp +++ b/host/lib/transport/udp_zero_copy_asio.cpp @@ -28,7 +28,7 @@ using namespace uhd::transport; * Constants **********************************************************************/ //enough buffering for half a second of samples at full rate on usrp2 -static const size_t MIN_SOCK_BUFF_SIZE(sizeof(boost::uint32_t) * 25e6 * 0.5); +static const size_t MIN_SOCK_BUFF_SIZE = size_t(sizeof(boost::uint32_t) * 25e6 * 0.5); static const size_t MAX_DGRAM_SIZE = 1500; //assume max size on send and recv static const double RECV_TIMEOUT = 0.1; //100 ms diff --git a/host/lib/usrp/usrp2/usrp2_impl.hpp b/host/lib/usrp/usrp2/usrp2_impl.hpp index 07e29eadd..42630a3e4 100644 --- a/host/lib/usrp/usrp2/usrp2_impl.hpp +++ b/host/lib/usrp/usrp2/usrp2_impl.hpp @@ -114,7 +114,7 @@ private: static const size_t _max_tx_bytes_per_packet = USRP2_UDP_BYTES - uhd::transport::vrt::max_if_hdr_words32*sizeof(boost::uint32_t) - - sizeof(uhd::transport::vrt::if_packet_info_t::cid) //no class id ever used + sizeof(uhd::transport::vrt::if_packet_info_t().cid) //no class id ever used ; }; |