Merge pull request #9 from spinicist/master

Removed min/max macros to prevent header include problems with LLVM.
PatWie · Jul 22, 2015 · d286cd7 · d286cd7
2 parents 7cd1c63 + 9b71e66
commit d286cd7
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 4 deletions.
diff --git a/src/LbfgsbSolver.cpp b/src/LbfgsbSolver.cpp
@@ -169,7 +169,7 @@ void LbfgsbSolver::GetGeneralizedCauchyPoint(Vector &x, Vector &g, Vector &x_cau
 
   }
 
-  dt_min = max(dt_min, 0);
+  dt_min = max(dt_min, 0.0);
   t_old += dt_min;
 
   Debug(SortedIndices[0] << " " << SortedIndices[1]);

diff --git a/src/LbfgsbSolver.h b/src/LbfgsbSolver.h
@@ -22,8 +22,8 @@
 
 #ifndef LBFGSBSOLVER_H_
 #define LBFGSBSOLVER_H_
-#include "ISolver.h"
 #include <list>
+#include "ISolver.h"
 namespace pwie
 {
 

diff --git a/src/Meta.h b/src/Meta.h
@@ -28,6 +28,9 @@
 #include <Eigen/Dense>
 #include <Eigen/Core>
 #include <stdexcept>
+#include <list>
+#include <vector>
+#include <algorithm>
 
 namespace pwie
 {
@@ -84,8 +87,9 @@ bool AssertEqual(T a, T b)
 }
 }
 
-#define min(a,b) (((a)<(b))?(a):(b))
-#define max(a,b) (((a)>(b))?(a):(b))
+using std::min;
+using std::max;
+
 #define EMPTY_HESSIAN (std::function<void(const Eigen::VectorXd & x, Eigen::MatrixXd & hessian)>())
 
 #define INF HUGE_VAL // std::numeric_limits<double>::infinity()