Unverified Commit e9534c15 authored by Mike Henry's avatar Mike Henry Committed by GitHub
Browse files

add missing header and fix logic for including cmath (#3658)

parent 8292bb3a
...@@ -33,12 +33,15 @@ ...@@ -33,12 +33,15 @@
#define NOMINMAX #define NOMINMAX
#endif #endif
#include <algorithm>
#include "ReferenceTabulatedFunction.h" #include "ReferenceTabulatedFunction.h"
#include "openmm/OpenMMException.h" #include "openmm/OpenMMException.h"
#include "openmm/internal/SplineFitter.h" #include "openmm/internal/SplineFitter.h"
#ifdef _MSC_VER #include <cmath>
#ifdef _MSC_VER
#if _MSC_VER < 1800 #if _MSC_VER < 1800
/** /**
* We need to define this ourselves, since Visual Studio is missing round() from cmath. * We need to define this ourselves, since Visual Studio is missing round() from cmath.
...@@ -46,13 +49,7 @@ ...@@ -46,13 +49,7 @@
static int round(double x) { static int round(double x) {
return (int) (x+0.5); return (int) (x+0.5);
} }
#else #endif
#include <cmath>
#endif // MSC_VER < 1800
#else
#include <cmath>
#endif #endif
static double wrap(double t, double min, double max) { static double wrap(double t, double min, double max) {
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment