[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [49305] trunk/blender: Fix compile errors on VC++ 2012 RC1.

[Daniel Genrich]

Revision: 49305
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=49305
Author:   genscher
Date:     2012-07-27 18:18:13 +0000 (Fri, 27 Jul 2012)
Log Message:
-----------
Fix compile errors on VC++ 2012 RC1.

Note: Compile still fails during ceres compile (namespace tr1 problems).

Modified Paths:
--------------
    trunk/blender/extern/libmv/third_party/ceres/include/ceres/jet.h
    trunk/blender/extern/libmv/third_party/ceres/internal/ceres/collections_port.h
    trunk/blender/intern/elbeem/intern/mvmcoords.cpp

Modified: trunk/blender/extern/libmv/third_party/ceres/include/ceres/jet.h
===================================================================
--- trunk/blender/extern/libmv/third_party/ceres/include/ceres/jet.h	2012-07-27 17:35:02 UTC (rev 49304)
+++ trunk/blender/extern/libmv/third_party/ceres/include/ceres/jet.h	2012-07-27 18:18:13 UTC (rev 49305)
@@ -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); }

Modified: trunk/blender/extern/libmv/third_party/ceres/internal/ceres/collections_port.h
===================================================================
--- trunk/blender/extern/libmv/third_party/ceres/internal/ceres/collections_port.h	2012-07-27 17:35:02 UTC (rev 49304)
+++ trunk/blender/extern/libmv/third_party/ceres/internal/ceres/collections_port.h	2012-07-27 18:18:13 UTC (rev 49305)
@@ -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

Modified: trunk/blender/intern/elbeem/intern/mvmcoords.cpp
===================================================================
--- trunk/blender/intern/elbeem/intern/mvmcoords.cpp	2012-07-27 17:35:02 UTC (rev 49304)
+++ trunk/blender/intern/elbeem/intern/mvmcoords.cpp	2012-07-27 18:18:13 UTC (rev 49305)
@@ -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()