Skip to content

GitLab

Commit e94afeaf authored by peastman's avatar peastman
Browse files

Merge pull request #370 from peastman/master 

Fixed compilation errors on Windows
parents 4e2c9968 77cec3f7
Show whitespace changes
Inline Side-by-side
Showing with 12 additions and 3 deletions
platforms/cuda/tests/TestCudaCustomCompoundBondForce.cpp
View file @ e94afeaf
...@@ -33,6 +33,9 @@ ...@@ -33,6 +33,9 @@
* This tests the CUDA implementation of CustomCompoundBondForce. * This tests the CUDA implementation of CustomCompoundBondForce.
*/ */
#ifdef WIN32
#define _USE_MATH_DEFINES // Needed to get M_PI
#endif
#include "openmm/internal/AssertionUtilities.h" #include "openmm/internal/AssertionUtilities.h"
#include "openmm/Context.h" #include "openmm/Context.h"
#include "CudaPlatform.h" #include "CudaPlatform.h"
...@@ -313,7 +316,7 @@ void testMultipleBonds() { ...@@ -313,7 +316,7 @@ void testMultipleBonds() {
parameters[0] = 1.0; parameters[0] = 1.0;
parameters[1] = 1.0; parameters[1] = 1.0;
parameters[2] = 2 * M_PI / 3; parameters[2] = 2 * M_PI / 3;
parameters[3] = sqrt(3) / 2; parameters[3] = sqrt(3.0) / 2;
vector<int> particles0(3); vector<int> particles0(3);
particles0[0] = 0; particles0[0] = 0;
particles0[1] = 1; particles0[1] = 1;
......
platforms/opencl/tests/TestOpenCLCustomCompoundBondForce.cpp
View file @ e94afeaf
...@@ -33,6 +33,9 @@ ...@@ -33,6 +33,9 @@
* This tests the OpenCL implementation of CustomCompoundBondForce. * This tests the OpenCL implementation of CustomCompoundBondForce.
*/ */
#ifdef WIN32
#define _USE_MATH_DEFINES // Needed to get M_PI
#endif
#include "openmm/internal/AssertionUtilities.h" #include "openmm/internal/AssertionUtilities.h"
#include "openmm/Context.h" #include "openmm/Context.h"
#include "OpenCLPlatform.h" #include "OpenCLPlatform.h"
...@@ -313,7 +316,7 @@ void testMultipleBonds() { ...@@ -313,7 +316,7 @@ void testMultipleBonds() {
parameters[0] = 1.0; parameters[0] = 1.0;
parameters[1] = 1.0; parameters[1] = 1.0;
parameters[2] = 2 * M_PI / 3; parameters[2] = 2 * M_PI / 3;
parameters[3] = sqrt(3) / 2; parameters[3] = sqrt(3.0) / 2;
vector<int> particles0(3); vector<int> particles0(3);
particles0[0] = 0; particles0[0] = 0;
particles0[1] = 1; particles0[1] = 1;
......
platforms/reference/tests/TestReferenceCustomCompoundBondForce.cpp
View file @ e94afeaf
...@@ -33,6 +33,9 @@ ...@@ -33,6 +33,9 @@
* This tests the reference implementation of CustomCompoundBondForce. * This tests the reference implementation of CustomCompoundBondForce.
*/ */
#ifdef WIN32
#define _USE_MATH_DEFINES // Needed to get M_PI
#endif
#include "openmm/internal/AssertionUtilities.h" #include "openmm/internal/AssertionUtilities.h"
#include "openmm/Context.h" #include "openmm/Context.h"
#include "ReferencePlatform.h" #include "ReferencePlatform.h"
...@@ -284,7 +287,7 @@ void testMultipleBonds() { ...@@ -284,7 +287,7 @@ void testMultipleBonds() {
parameters[0] = 1.0; parameters[0] = 1.0;
parameters[1] = 1.0; parameters[1] = 1.0;
parameters[2] = 2 * M_PI / 3; parameters[2] = 2 * M_PI / 3;
parameters[3] = sqrt(3) / 2; parameters[3] = sqrt(3.0) / 2;
vector<int> particles0(3); vector<int> particles0(3);
particles0[0] = 0; particles0[0] = 0;
particles0[1] = 1; particles0[1] = 1;
......
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