From 9b71e6677acf7b9bbe83c3f9c36d6e3bc5df5655 Mon Sep 17 00:00:00 2001
From: Tobias Wood <tobias@spinicist.org.uk>
Date: Tue, 21 Jul 2015 16:32:07 +0100
Subject: [PATCH] Removed min/max macros to prevent header include problems
 with LLVM.

---
 src/LbfgsbSolver.cpp | 2 +-
 src/LbfgsbSolver.h   | 2 +-
 src/Meta.h           | 8 ++++++--
 3 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/src/LbfgsbSolver.cpp b/src/LbfgsbSolver.cpp
index bc58b4a..7010255 100644
--- 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
index 7a57c2d..d8fd33c 100644
--- 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
index 621c864..abe8ddf 100644
--- 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()