Fixed compilation errors

plugins/amoeba/platforms/reference/src/SimTKReference/AmoebaReferenceVdwForce.cpp

@@ -24,6 +24,7 @@
 
 #include "AmoebaReferenceForce.h"
 #include "AmoebaReferenceVdwForce.h"
+#include <algorithm>
 
 AmoebaReferenceVdwForce::AmoebaReferenceVdwForce( ) : _nonbondedMethod(NoCutoff) {
 

serialization/src/SerializationNode.cpp

@@ -37,7 +37,7 @@ using namespace OpenMM;
 using namespace std;
 
 extern "C" char* g_fmt(char*, double);
-extern "C" double strtod(const char* s00, char** se);
+extern "C" double strtod2(const char* s00, char** se);
 
 const string& SerializationNode::getName() const {
     return name;
@@ -125,14 +125,14 @@ double SerializationNode::getDoubleProperty(const string& name) const {
     map<string, string>::const_iterator iter = properties.find(name);
     if (iter == properties.end())
         throw OpenMMException("Unknown property '"+name+"' in node '"+getName()+"'");
-    return strtod(iter->second.c_str(), NULL);
+    return strtod2(iter->second.c_str(), NULL);
 }
 
 double SerializationNode::getDoubleProperty(const string& name, double defaultValue) const {
     map<string, string>::const_iterator iter = properties.find(name);
     if (iter == properties.end())
         return defaultValue;
-    return strtod(iter->second.c_str(), NULL);
+    return strtod2(iter->second.c_str(), NULL);
 }
 
 SerializationNode& SerializationNode::setDoubleProperty(const string& name, double value) {

serialization/src/dtoa.cpp

@@ -512,7 +512,7 @@ BCinfo { int dp0, dp1, dplen, dsign, e0, inexact, nd, nd0, rounding, scale, uflc
 #define Kmax 7
 
 #ifdef __cplusplus
-extern "C" double strtod(const char *s00, char **se);
+extern "C" double strtod2(const char *s00, char **se);
 extern "C" char *dtoa(double d, int mode, int ndigits,
 			int *decpt, int *sign, char **rve);
 #endif
@@ -2456,7 +2456,7 @@ retlow1:
 #endif /* NO_STRTOD_BIGCOMP */
 
  double
-strtod
+strtod2
 #ifdef KR_headers
 	(s00, se) CONST char *s00; char **se;
 #else