diff options
| author | Daniel Genrich <daniel.genrich@gmx.net> | 2012-07-27 22:18:13 +0400 |
|---|---|---|
| committer | Daniel Genrich <daniel.genrich@gmx.net> | 2012-07-27 22:18:13 +0400 |
| commit | 24a00f14af707f9940d8b40ac887b9ed1d7bbcf7 (patch) | |
| tree | 127b276ebe434c3c8ce12166fe10c1686a6a0362 /extern | |
| parent | 718569dc16e35ef37838d0357f75e945a96928b1 (diff) | |
Fix compile errors on VC++ 2012 RC1.
Note: Compile still fails during ceres compile (namespace tr1 problems).
Diffstat (limited to 'extern')
| -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 |
2 files changed, 3 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 |