Fix compile errors on VC++ 2012 RC1.

Note: Compile still fails during ceres compile (namespace tr1 problems).
This commit is contained in:
Daniel Genrich
2012-07-27 18:18:13 +00:00
parent 718569dc16
commit 24a00f14af
3 changed files with 10 additions and 3 deletions

View File

@@ -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); }

View File

@@ -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

View File

@@ -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()