Merge branch 'maint'

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

5 files changed, 21 insertions, 21 deletions

diff --git a/host/include/uhd/transport/vrt_if_packet.hpp b/host/include/uhd/transport/vrt_if_packet.hpp
index 8bc65cdf1..1e54607c1 100644
--- a/host/include/uhd/transport/vrt_if_packet.hpp
+++ b/host/include/uhd/transport/vrt_if_packet.hpp
@@ -46,7 +46,7 @@ namespace vrt{
         {
             LINK_TYPE_NONE = 0x0,
             LINK_TYPE_CHDR = 0x1,
-            LINK_TYPE_VRLP = 0x2,
+            LINK_TYPE_VRLP = 0x2
         } link_type;
 
         //packet type
@@ -63,7 +63,7 @@ namespace vrt{
             PACKET_TYPE_ACK       = 0x1, // Flow control (ack)
             PACKET_TYPE_CMD       = 0x2, // Command
             PACKET_TYPE_RESP      = 0x3, // Command response
-            PACKET_TYPE_ERROR     = 0x3, // Command response: Error (the EOB bit is raised in this case)
+            PACKET_TYPE_ERROR     = 0x3  // Command response: Error (the EOB bit is raised in this case)
         } packet_type;
 
         //size fields
diff --git a/host/include/uhd/types/clock_config.hpp b/host/include/uhd/types/clock_config.hpp
index 27b312245..6d5d01ec2 100644
--- a/host/include/uhd/types/clock_config.hpp
+++ b/host/include/uhd/types/clock_config.hpp
@@ -47,12 +47,12 @@ namespace uhd{
             REF_AUTO = int('a'), //automatic (device specific)
             REF_INT  = int('i'), //internal reference
             REF_SMA  = int('s'), //external sma port
-            REF_MIMO = int('m'), //reference from mimo cable
+            REF_MIMO = int('m')  //reference from mimo cable
         } ref_source;
         enum pps_source_t {
             PPS_INT  = int('i'), //there is no internal
             PPS_SMA  = int('s'), //external sma port
-            PPS_MIMO = int('m'), //time sync from mimo cable
+            PPS_MIMO = int('m')  //time sync from mimo cable
         } pps_source;
         enum pps_polarity_t {
             PPS_NEG = int('n'), //negative edge
diff --git a/host/include/uhd/utils/fp_compare_delta.ipp b/host/include/uhd/utils/fp_compare_delta.ipp
index 092ade6e9..49cbc281b 100644
--- a/host/include/uhd/utils/fp_compare_delta.ipp
+++ b/host/include/uhd/utils/fp_compare_delta.ipp
@@ -100,8 +100,8 @@ namespace uhd { namespace math { namespace fp_compare {
 
     template<typename float_t> UHD_INLINE
     bool operator==(fp_compare_delta<float_t> lhs, double rhs) {
-        float_t delta = fp_compare_select_delta(double(lhs._delta),
-                DOUBLE_PRECISION_DELTA);
+        float_t delta = float_t(fp_compare_select_delta(double(lhs._delta),
+                DOUBLE_PRECISION_DELTA));
         return (std::fabs(lhs._value - rhs) < delta);
     }
 
@@ -112,8 +112,8 @@ namespace uhd { namespace math { namespace fp_compare {
 
     template<typename float_t> UHD_INLINE
     bool operator<(fp_compare_delta<float_t> lhs, double rhs) {
-        float_t delta = fp_compare_select_delta(double(lhs._delta),
-                DOUBLE_PRECISION_DELTA);
+        float_t delta = float_t(fp_compare_select_delta(double(lhs._delta),
+                DOUBLE_PRECISION_DELTA));
         return ((rhs - lhs._value) > delta);
     }
 
@@ -124,8 +124,8 @@ namespace uhd { namespace math { namespace fp_compare {
 
     template<typename float_t> UHD_INLINE
     bool operator>(fp_compare_delta<float_t> lhs, double rhs) {
-        float_t delta = fp_compare_select_delta(double(lhs._delta),
-                DOUBLE_PRECISION_DELTA);
+        float_t delta = float_t(fp_compare_select_delta(double(lhs._delta),
+                DOUBLE_PRECISION_DELTA));
         return ((lhs._value - rhs) > delta);
     }
 
@@ -148,8 +148,8 @@ namespace uhd { namespace math { namespace fp_compare {
 
     template<typename float_t> UHD_INLINE
     bool operator<(double lhs, fp_compare_delta<float_t> rhs) {
-        float_t delta = fp_compare_select_delta(DOUBLE_PRECISION_DELTA,
-                double(rhs._delta));
+        float_t delta = float_t(fp_compare_select_delta(DOUBLE_PRECISION_DELTA,
+                double(rhs._delta)));
         return ((rhs._value - lhs) > delta);
     }
 
@@ -160,8 +160,8 @@ namespace uhd { namespace math { namespace fp_compare {
 
     template<typename float_t> UHD_INLINE
     bool operator>(double lhs, fp_compare_delta<float_t> rhs) {
-        float_t delta = fp_compare_select_delta(DOUBLE_PRECISION_DELTA,
-                double(rhs._delta));
+        float_t delta = float_t(fp_compare_select_delta(DOUBLE_PRECISION_DELTA,
+                double(rhs._delta)));
         return ((lhs - rhs._value) > delta);
     }
 
diff --git a/host/include/uhd/utils/log.hpp b/host/include/uhd/utils/log.hpp
index 5baa00108..106c0d9d5 100644
--- a/host/include/uhd/utils/log.hpp
+++ b/host/include/uhd/utils/log.hpp
@@ -76,7 +76,7 @@ namespace uhd{ namespace _log{
         regularly   = 3,
         rarely      = 4,
         very_rarely = 5,
-        never       = 6,
+        never       = 6
     };
 
     //! Internal logging object (called by UHD_LOG macros)
@@ -101,12 +101,12 @@ namespace uhd{ namespace _log{
 
         // General insertion overload
         template <typename T>
-        INSERTION_OVERLOAD(T val);
+        INSERTION_OVERLOAD(T val)
 
         // Insertion overloads for std::ostream manipulators
-        INSERTION_OVERLOAD(std::ostream& (*val)(std::ostream&));
-        INSERTION_OVERLOAD(std::ios& (*val)(std::ios&));
-        INSERTION_OVERLOAD(std::ios_base& (*val)(std::ios_base&));
+        INSERTION_OVERLOAD(std::ostream& (*val)(std::ostream&))
+        INSERTION_OVERLOAD(std::ios& (*val)(std::ios&))
+        INSERTION_OVERLOAD(std::ios_base& (*val)(std::ios_base&))
 
     private:
         std::ostringstream _ss;
diff --git a/host/include/uhd/utils/math.hpp b/host/include/uhd/utils/math.hpp
index 275a94f72..46a1cf7e4 100644
--- a/host/include/uhd/utils/math.hpp
+++ b/host/include/uhd/utils/math.hpp
@@ -60,7 +60,7 @@ namespace math {
      * values, a custom epsilon should be defined for those computations. This
      * use-case is provided for in the `fp_compare_epsilon` class constructor.
      */
-    static const float SINGLE_PRECISION_EPSILON = 1.19e-7;
+    static const float SINGLE_PRECISION_EPSILON = 1.19e-7f;
     static const double DOUBLE_PRECISION_EPSILON = 2.22e-16;
 
 namespace fp_compare {
@@ -155,7 +155,7 @@ namespace fp_compare {
      * These are the default deltas used by the 'fp_compare_delta' class for
      * single and double-precision floating point comparisons.
      */
-    static const float SINGLE_PRECISION_DELTA = 1e-3;
+    static const float SINGLE_PRECISION_DELTA = 1e-3f;
     static const double DOUBLE_PRECISION_DELTA = 1e-5;
 
     /*! Floating-point delta to use for frequency comparisons. */