Two tiny improvements

diff --git a/include/dai/factor.h b/include/dai/factor.h
index b441116..24d136f 100644 (file)
--- a/include/dai/factor.h
+++ b/include/dai/factor.h
@@ -383,7 +383,7 @@ template <typename T> class TFactor {
             if( _vs == ns )
                 return *this;
             else
-                return (*this) * TFactor<T>(ns / _vs, 1);
+                return (*this) * TFactor<T>(ns / _vs, (T)1);
         }
 
         /// Returns true if *this has NaN values

diff --git a/include/dai/prob.h b/include/dai/prob.h
index 73c87e0..4b85374 100644 (file)
--- a/include/dai/prob.h
+++ b/include/dai/prob.h
@@ -455,7 +455,7 @@ template <typename T> class TProb {
                 arg = i;
               }
             }
-            return make_pair(arg,max);
+            return std::make_pair(arg,max);
         }
 
         /// Normalizes vector using the specified norm