Merge branch 'master' of github.com:SimTk/openmm

platforms/opencl/src/OpenCLPlatform.cpp

@@ -40,9 +40,15 @@ using std::string;
 using std::stringstream;
 using std::vector;
 
+#ifdef OPENMM_OPENCL_BUILDING_STATIC_LIBRARY
+extern "C" void registerOpenCLPlatform() {
+    Platform::registerPlatform(new OpenCLPlatform());
+}
+#else
 extern "C" OPENMM_EXPORT_OPENCL void registerPlatforms() {
     Platform::registerPlatform(new OpenCLPlatform());
 }
+#endif
 
 OpenCLPlatform::OpenCLPlatform() {
     OpenCLKernelFactory* factory = new OpenCLKernelFactory();

platforms/opencl/tests/TestOpenCLCustomGBForce.cpp

@@ -277,7 +277,7 @@ void testTabulatedFunction() {
     vector<double> table;
     for (int i = 0; i < 21; i++)
         table.push_back(std::sin(0.25*i));
-    force->addFunction("fn", table, 1.0, 6.0);
+    force->addTabulatedFunction("fn", new Continuous1DFunction(table, 1.0, 6.0));
     system.addForce(force);
     Context context(system, integrator, platform);
     vector<Vec3> positions(2);