diff options
| -rw-r--r-- | extern/libmv/third_party/ceres/include/ceres/jet.h | 4 | ||||
| -rw-r--r-- | extern/libmv/third_party/ceres/internal/ceres/collections_port.h | 2 | ||||
| -rw-r--r-- | intern/elbeem/intern/mvmcoords.cpp | 7 |
3 files changed, 10 insertions, 3 deletions
diff --git a/extern/libmv/third_party/ceres/include/ceres/jet.h b/extern/libmv/third_party/ceres/include/ceres/jet.h index 264861735ed..a37870210f1 100644 --- a/extern/libmv/third_party/ceres/include/ceres/jet.h +++ b/extern/libmv/third_party/ceres/include/ceres/jet.h @@ -163,8 +163,8 @@ #include "Eigen/Core" -// Visual Studio 2010 or older version -#if defined(_MSC_VER) && _MSC_VER <= 1600 +// Visual Studio 2012 or older version +#if defined(_MSC_VER) && _MSC_VER <= 1700 namespace std { inline bool isfinite(double x) { return _finite(x); } inline bool isinf (double x) { return !_finite(x) && !_isnan(x); } diff --git a/extern/libmv/third_party/ceres/internal/ceres/collections_port.h b/extern/libmv/third_party/ceres/internal/ceres/collections_port.h index 55f72539023..6f8a830a85e 100644 --- a/extern/libmv/third_party/ceres/internal/ceres/collections_port.h +++ b/extern/libmv/third_party/ceres/internal/ceres/collections_port.h @@ -33,7 +33,7 @@ #ifndef CERES_INTERNAL_COLLECTIONS_PORT_H_ #define CERES_INTERNAL_COLLECTIONS_PORT_H_ -#if defined(_MSC_VER) && _MSC_VER <= 1600 +#if defined(_MSC_VER) && _MSC_VER <= 1700 #include <unordered_map> #include <unordered_set> #else diff --git a/intern/elbeem/intern/mvmcoords.cpp b/intern/elbeem/intern/mvmcoords.cpp index 426b8c6606d..281a9656fcf 100644 --- a/intern/elbeem/intern/mvmcoords.cpp +++ b/intern/elbeem/intern/mvmcoords.cpp @@ -16,6 +16,13 @@ #include "mvmcoords.h" #include <algorithm> + +#if defined(_MSC_VER) && _MSC_VER > 1600 +// sdt::greater +#include <functional> +#endif + + using std::vector; void MeanValueMeshCoords::clear() |