Merge pull request #424 from smikes/vs2013-compile-errors

VS2013 compile errors

libraries/validate/src/ValidateOpenMMForces.cpp

@@ -552,7 +552,7 @@ ForceValidationResult* ValidateOpenMMForces::compareForce(Context& context, std:
         if( forceName.compare( "NA" ) == 0 ){
             std::stringstream message;
             message << "Force at index=" << ii << " not found -- aborting!";
-            std::cerr << message << std::endl;
+            std::cerr << message.str() << std::endl;
             throw OpenMM::OpenMMException(message.str());
         }
         systemForceNameMap[forceName] = ii;

openmmapi/include/openmm/internal/MSVC_erfc.h

@@ -9,7 +9,9 @@
  */
 
 #if defined(_MSC_VER) 
+#ifndef M_PI
 #define M_PI 3.14159265358979323846264338327950288
+#endif
 
 #if _MSC_VER <= 1700 // 1700 is VC11, 1800 is VC12 
 /***************************

openmmapi/src/CustomNonbondedForceImpl.cpp

@@ -43,6 +43,7 @@
 #include <cmath>
 #include <sstream>
 #include <utility>
+#include <algorithm>
 
 using namespace OpenMM;
 using namespace std;

openmmapi/src/MonteCarloAnisotropicBarostatImpl.cpp

@@ -35,6 +35,7 @@
 #include "openmm/kernels.h"
 #include <cmath>
 #include <vector>
+#include <algorithm>
 
 using namespace OpenMM;
 using namespace OpenMM_SFMT;

openmmapi/src/MonteCarloBarostatImpl.cpp

@@ -35,6 +35,7 @@
 #include "openmm/kernels.h"
 #include <cmath>
 #include <vector>
+#include <algorithm>
 
 using namespace OpenMM;
 using namespace OpenMM_SFMT;

openmmapi/src/NonbondedForceImpl.cpp

@@ -39,6 +39,7 @@
 #include <cmath>
 #include <map>
 #include <sstream>
+#include <algorithm>
 
 using namespace OpenMM;
 using namespace std;

platforms/cpu/tests/TestCpuNeighborList.cpp

@@ -43,6 +43,7 @@
 #include <set>
 #include <utility>
 #include <vector>
+#include <algorithm>
 
 using namespace OpenMM;
 using namespace std;

platforms/reference/src/ReferenceTabulatedFunction.cpp

@@ -34,12 +34,19 @@
 #include "openmm/internal/SplineFitter.h"
 
 #ifdef _MSC_VER
+
+#if _MSC_VER < 1800
 /**
  * We need to define this ourselves, since Visual Studio is missing round() from cmath.
  */
 static int round(double x) {
     return (int) (x+0.5);
 }
+#else
+#include <cmath>
+#endif  // MSC_VER < 1800
+
+
 #else
 #include <cmath>
 #endif

platforms/reference/src/SimTKReference/ReferenceLJCoulombIxn.cpp

@@ -25,6 +25,7 @@
 #include <string.h>
 #include <sstream>
 #include <complex>
+#include <algorithm>
 
 #include "SimTKOpenMMCommon.h"
 #include "SimTKOpenMMLog.h"

platforms/reference/src/SimTKReference/ReferenceNeighborList.cpp

@@ -4,6 +4,7 @@
 #include <cmath>
 #include <iostream>
 #include <cassert>
+#include <algorithm>
 
 using namespace std;
 

platforms/reference/src/SimTKReference/ReferenceVariableStochasticDynamics.cpp

@@ -24,6 +24,7 @@
 
 #include <cstring>
 #include <sstream>
+#include <algorithm>
 
 #include "SimTKOpenMMCommon.h"
 #include "SimTKOpenMMLog.h"

platforms/reference/src/SimTKReference/ReferenceVariableVerletDynamics.cpp

@@ -24,6 +24,7 @@
 
 #include <string.h>
 #include <sstream>
+#include <algorithm>
 
 #include "SimTKOpenMMCommon.h"
 #include "SimTKOpenMMLog.h"