"wrappers/python/vscode:/vscode.git/clone" did not exist on "efa09228b8c0b05a3cb9b24cc2583e6fef74bda3"
Commit b683cd81 authored by peastman's avatar peastman
Browse files

Fixed compilation errors on Windows

parent ddd7307d
...@@ -42,7 +42,7 @@ ...@@ -42,7 +42,7 @@
namespace OpenMM { namespace OpenMM {
class OPENMM_EXPORT CpuGayBerneForce { class CpuGayBerneForce {
public: public:
struct Matrix; struct Matrix;
class ComputeTask; class ComputeTask;
......
...@@ -29,11 +29,16 @@ ...@@ -29,11 +29,16 @@
* USE OR OTHER DEALINGS IN THE SOFTWARE. * * USE OR OTHER DEALINGS IN THE SOFTWARE. *
* -------------------------------------------------------------------------- */ * -------------------------------------------------------------------------- */
#ifdef _MSC_VER
// Prevent Windows from defining macros that interfere with other code.
#define NOMINMAX
#endif
#include "CpuGayBerneForce.h" #include "CpuGayBerneForce.h"
#include "ReferenceForce.h" #include "ReferenceForce.h"
#include "openmm/OpenMMException.h" #include "openmm/OpenMMException.h"
#include "openmm/GayBerneForce.h" #include "openmm/GayBerneForce.h"
#include "openmm/internal/gmx_atomic.h" #include "openmm/internal/gmx_atomic.h"
#include <algorithm>
#include <cmath> #include <cmath>
using namespace OpenMM; using namespace OpenMM;
......
...@@ -29,9 +29,14 @@ ...@@ -29,9 +29,14 @@
* USE OR OTHER DEALINGS IN THE SOFTWARE. * * USE OR OTHER DEALINGS IN THE SOFTWARE. *
* -------------------------------------------------------------------------- */ * -------------------------------------------------------------------------- */
#ifdef _MSC_VER
// Prevent Windows from defining macros that interfere with other code.
#define NOMINMAX
#endif
#include "ReferenceGayBerneForce.h" #include "ReferenceGayBerneForce.h"
#include "ReferenceForce.h" #include "ReferenceForce.h"
#include "openmm/OpenMMException.h" #include "openmm/OpenMMException.h"
#include <algorithm>
#include <cmath> #include <cmath>
using namespace OpenMM; using namespace OpenMM;
......
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