diff options
| author | Martin Braun <martin.braun@ettus.com> | 2015-03-11 16:45:19 -0700 |
|---|---|---|
| committer | Martin Braun <martin.braun@ettus.com> | 2015-03-11 16:58:23 -0700 |
| commit | cc7d37f114d5a14b4e45372f38324bf95115b6b9 (patch) | |
| tree | 0b6a39418c0aa5caafa3039b578c94d3db8f1775 /host/lib/usrp/cores | |
| parent | fae746179cbb1d8ac146dcae9b5d6cb58b366a56 (diff) | |
| download | uhd-cc7d37f114d5a14b4e45372f38324bf95115b6b9.tar.gz uhd-cc7d37f114d5a14b4e45372f38324bf95115b6b9.tar.bz2 uhd-cc7d37f114d5a14b4e45372f38324bf95115b6b9.zip | |
uhd: Fixed several type-cast related warnings for naggy compilers
Diffstat (limited to 'host/lib/usrp/cores')
| -rw-r--r-- | host/lib/usrp/cores/rx_dsp_core_3000.cpp | 2 | ||||
| -rw-r--r-- | host/lib/usrp/cores/time_core_3000.cpp | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/host/lib/usrp/cores/rx_dsp_core_3000.cpp b/host/lib/usrp/cores/rx_dsp_core_3000.cpp index 13d69920a..8a131ffb4 100644 --- a/host/lib/usrp/cores/rx_dsp_core_3000.cpp +++ b/host/lib/usrp/cores/rx_dsp_core_3000.cpp @@ -72,7 +72,7 @@ public: { UHD_SAFE_CALL ( - //NOP + ;//NOP ) } diff --git a/host/lib/usrp/cores/time_core_3000.cpp b/host/lib/usrp/cores/time_core_3000.cpp index aa5d5593d..ffae5dc0d 100644 --- a/host/lib/usrp/cores/time_core_3000.cpp +++ b/host/lib/usrp/cores/time_core_3000.cpp @@ -50,7 +50,7 @@ struct time_core_3000_impl : time_core_3000 { UHD_SAFE_CALL ( - //NOP + ;//NOP ) } @@ -71,8 +71,8 @@ struct time_core_3000_impl : time_core_3000 UHD_MSG(status) << ((test_fail)? " fail" : "pass") << std::endl; //useful warning for debugging actual rate - const size_t ticks_elapsed = _tick_rate*approx_secs; - const size_t appox_rate = ticks_elapsed/(sleep_millis/1e3); + const size_t ticks_elapsed = size_t(_tick_rate*approx_secs); + const size_t appox_rate = size_t(ticks_elapsed/(sleep_millis/1e3)); if (test_fail) UHD_MSG(warning) << "Expecting clock rate: " << (_tick_rate/1e6) << " MHz\n" << "Appoximate clock rate: " << (appox_rate/1e6) << " MHz\n" |