Merge branch 'maint'

Conflicts:
	host/include/uhd/transport/vrt_if_packet.hpp

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"