diff options
| author | Martin Braun <martin.braun@ettus.com> | 2015-03-11 17:00:39 -0700 |
|---|---|---|
| committer | Martin Braun <martin.braun@ettus.com> | 2015-03-11 17:05:10 -0700 |
| commit | 2e594ae877f99411d54f1a8e3d9be274d8b9eb35 (patch) | |
| tree | 2fa0a5f0fc501ab2362f424831b367610077c2d6 /host/utils/usrp_cal_utils.hpp | |
| parent | a7049e4ff79cdc205db76bf7270219f254073961 (diff) | |
| parent | cc7d37f114d5a14b4e45372f38324bf95115b6b9 (diff) | |
| download | uhd-2e594ae877f99411d54f1a8e3d9be274d8b9eb35.tar.gz uhd-2e594ae877f99411d54f1a8e3d9be274d8b9eb35.tar.bz2 uhd-2e594ae877f99411d54f1a8e3d9be274d8b9eb35.zip | |
Merge branch 'maint'
Conflicts:
host/include/uhd/transport/vrt_if_packet.hpp
Diffstat (limited to 'host/utils/usrp_cal_utils.hpp')
| -rw-r--r-- | host/utils/usrp_cal_utils.hpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/host/utils/usrp_cal_utils.hpp b/host/utils/usrp_cal_utils.hpp index c027a4785..ccdb0a61d 100644 --- a/host/utils/usrp_cal_utils.hpp +++ b/host/utils/usrp_cal_utils.hpp @@ -249,7 +249,7 @@ static void capture_samples( // Right after the stream is started, there will be transient data. // That transient data is discarded and only "good" samples are returned. - size_t nsamps_to_discard = usrp->get_rx_rate() * 0.001; // 1ms to be discarded + size_t nsamps_to_discard = size_t(usrp->get_rx_rate() * 0.001); // 1ms to be discarded std::vector<samp_type> discard_buff(nsamps_to_discard); uhd::stream_cmd_t stream_cmd(uhd::stream_cmd_t::STREAM_MODE_NUM_SAMPS_AND_DONE); |