Merge pull request #2694 from thtrummer/master

Fix invalid call to __host__ function in computeBondedForces

platforms/common/src/kernels/cmapTorsionForce.cc

@@ -61,8 +61,8 @@ angleB = fmod(angleB+2.0f*PI, 2.0f*PI);
 int2 pos = MAP_POS[MAPS[index]];
 int size = pos.y;
 real delta = 2*PI/size;
-int s = (int) fmin(angleA/delta, size-1);
-int t = (int) fmin(angleB/delta, size-1);
+int s = (int) fmin(angleA/delta, (real) (size-1));
+int t = (int) fmin(angleB/delta, (real) (size-1));
 float4 c[4];
 int coeffIndex = pos.x+4*(s+size*t);
 c[0] = COEFF[coeffIndex];

platforms/common/src/kernels/customIntegratorPerDof.cc

@@ -3,8 +3,8 @@ typedef double TempType;
 typedef double3 TempType3;
 typedef double4 TempType4;
 
-#define make_TempType3(...) make_double3(__VA_ARGS__)
-#define make_TempType4(...) make_double4(__VA_ARGS__)
+#define make_TempType3 make_double3
+#define make_TempType4 make_double4
 #define convertToTempType3(a) make_double3((a).x, (a).y, (a).z)
 #define convertToTempType4(a) make_double4((a).x, (a).y, (a).z, (a).w)
 
@@ -16,8 +16,8 @@ typedef float TempType;
 typedef float3 TempType3;
 typedef float4 TempType4;
 
-#define make_TempType3(...) make_float3(__VA_ARGS__)
-#define make_TempType4(...) make_float4(__VA_ARGS__)
+#define make_TempType3 make_float3
+#define make_TempType4 make_float4
 #define convertToTempType3(a) make_float3((a).x, (a).y, (a).z)
 #define convertToTempType4(a) make_float4((a).x, (a).y, (a).z, (a).w)
 #endif