Minor code cleanup

platforms/cpu/src/CpuPlatform.cpp

@@ -59,7 +59,7 @@ extern "C" OPENMM_EXPORT_CPU void registerPlatforms() {
 map<const ContextImpl*, CpuPlatform::PlatformData*> CpuPlatform::contextData;
 
 CpuPlatform::CpuPlatform() {
-    deprecatedPropertyReplacements["CpuThreads"] = "Threads";
+    deprecatedPropertyReplacements["CpuThreads"] = CpuThreads();
     CpuKernelFactory* factory = new CpuKernelFactory();
     registerKernelFactory(CalcForcesAndEnergyKernel::Name(), factory);
     registerKernelFactory(CalcHarmonicAngleForceKernel::Name(), factory);

platforms/cuda/src/CudaPlatform.cpp

@@ -62,14 +62,14 @@ extern "C" OPENMM_EXPORT_CUDA void registerPlatforms() {
 #endif
 
 CudaPlatform::CudaPlatform() {
-    deprecatedPropertyReplacements["CudaDeviceIndex"] = "DeviceIndex";
-    deprecatedPropertyReplacements["CudaDeviceName"] = "DeviceName";
-    deprecatedPropertyReplacements["CudaUseBlockingSync"] = "UseBlockingSync";
-    deprecatedPropertyReplacements["CudaPrecision"] = "Precision";
-    deprecatedPropertyReplacements["CudaUseCpuPme"] = "UseCpuPme";
-    deprecatedPropertyReplacements["CudaTempDirectory"] = "TempDirectory";
-    deprecatedPropertyReplacements["CudaDisablePmeStream"] = "DisablePmeStream";
-    deprecatedPropertyReplacements["CudaDeterministicForces"] = "DeterministicForces";
+    deprecatedPropertyReplacements["CudaDeviceIndex"] = CudaDeviceIndex();
+    deprecatedPropertyReplacements["CudaDeviceName"] = CudaDeviceName();
+    deprecatedPropertyReplacements["CudaUseBlockingSync"] = CudaUseBlockingSync();
+    deprecatedPropertyReplacements["CudaPrecision"] = CudaPrecision();
+    deprecatedPropertyReplacements["CudaUseCpuPme"] = CudaUseCpuPme();
+    deprecatedPropertyReplacements["CudaTempDirectory"] = CudaTempDirectory();
+    deprecatedPropertyReplacements["CudaDisablePmeStream"] = CudaDisablePmeStream();
+    deprecatedPropertyReplacements["CudaDeterministicForces"] = CudaDeterministicForces();
     CudaKernelFactory* factory = new CudaKernelFactory();
     registerKernelFactory(CalcForcesAndEnergyKernel::Name(), factory);
     registerKernelFactory(UpdateStateDataKernel::Name(), factory);

platforms/opencl/src/OpenCLPlatform.cpp

@@ -56,11 +56,11 @@ extern "C" OPENMM_EXPORT_OPENCL void registerPlatforms() {
 #endif
 
 OpenCLPlatform::OpenCLPlatform() {
-    deprecatedPropertyReplacements["OpenCLDeviceIndex"] = "DeviceIndex";
-    deprecatedPropertyReplacements["OpenCLDeviceName"] = "DeviceName";
-    deprecatedPropertyReplacements["OpenCLPrecision"] = "Precision";
-    deprecatedPropertyReplacements["OpenCLUseCpuPme"] = "UseCpuPme";
-    deprecatedPropertyReplacements["OpenCLDisablePmeStream"] = "DisablePmeStream";
+    deprecatedPropertyReplacements["OpenCLDeviceIndex"] = OpenCLDeviceIndex();
+    deprecatedPropertyReplacements["OpenCLDeviceName"] = OpenCLDeviceName();
+    deprecatedPropertyReplacements["OpenCLPrecision"] = OpenCLPrecision();
+    deprecatedPropertyReplacements["OpenCLUseCpuPme"] = OpenCLUseCpuPme();
+    deprecatedPropertyReplacements["OpenCLDisablePmeStream"] = OpenCLDisablePmeStream();
     OpenCLKernelFactory* factory = new OpenCLKernelFactory();
     registerKernelFactory(CalcForcesAndEnergyKernel::Name(), factory);
     registerKernelFactory(UpdateStateDataKernel::Name(), factory);