Changed a few method signatures to make them easier to wrap

olla/include/openmm/Platform.h

@@ -67,7 +67,7 @@ public:
     /**
      * Get the name of this platform.  This should be a unique identifier which can be used to recognized it.
      */
-    virtual std::string getName() const = 0;
+    virtual const std::string& getName() const = 0;
     /**
      * Get an estimate of how fast this Platform class is.  This need not be precise.  It only is expected to
      * return an order or magnitude estimate of the relative performance of different Platform classes.  An
@@ -103,7 +103,7 @@ public:
      * @param name     the kernel name for which the factory should be used
      * @param factory  the factory to use for creating Kernels with the specified name
      */
-    void registerKernelFactory(std::string name, KernelFactory* factory);
+    void registerKernelFactory(const std::string& name, KernelFactory* factory);
     /**
      * Register a StreamFactory which should be used to create Streams with a particular name.
      * The Platform takes over ownership of the factory, and will delete it when the Platform itself
@@ -112,7 +112,7 @@ public:
      * @param name     the stream name for which the factory should be used
      * @param factory  the factory to use for creating Streams with the specified name
      */
-    void registerStreamFactory(std::string name, StreamFactory* factory);
+    void registerStreamFactory(const std::string& name, StreamFactory* factory);
     /**
      * Determine whether this Platforms provides implementations of a set of kernels.
      * 
@@ -133,7 +133,7 @@ public:
      * @param context the context for which to create a Kernel
      * @return a newly created Kernel object
      */
-    Kernel createKernel(std::string name, OpenMMContextImpl& context) const;
+    Kernel createKernel(const std::string& name, OpenMMContextImpl& context) const;
     /**
      * Create a Stream object.  If you call this method multiple times for different contexts with the same name,
      * the returned Streams are independent and do not interact with each other.  This means
@@ -147,7 +147,7 @@ public:
      * @param context the context for which to create a Stream
      * @return a newly created Stream object
      */
-    Stream createStream(std::string name, int size, Stream::DataType type, OpenMMContextImpl& context) const;
+    Stream createStream(const std::string& name, int size, Stream::DataType type, OpenMMContextImpl& context) const;
     /**
      * Register a new Platform.
      */
@@ -180,7 +180,7 @@ public:
      *               system's rules for loading libraries.  Typically it may be either an absolute path
      *               or relative to a set of standard locations.
      */
-    static void loadPluginLibrary(std::string file);
+    static void loadPluginLibrary(const std::string& file);
     /**
      * Load multiple dynamic libraries (DLLs) which contain OpenMM plugins from a single directory.
      * This method loops over every file contained in the specified directory and calls loadPluginLibrary()
@@ -190,7 +190,7 @@ public:
      * @param directory    the path to the directory containing libraries to load
      * @return the names of all files which were successfully loaded as libraries
      */
-    static std::vector<std::string> loadPluginsFromDirectory(std::string directory);
+    static std::vector<std::string> loadPluginsFromDirectory(const std::string& directory);
     /**
      * Get the default directory from which to load plugins.  If the environment variable
      * OPENMM_PLUGIN_DIR is set, this returns its value.  Otherwise, it returns a platform

olla/src/Platform.cpp

@@ -80,11 +80,11 @@ void Platform::contextCreated(OpenMMContextImpl& context) const {
 void Platform::contextDestroyed(OpenMMContextImpl& context) const {
 }
 
-void Platform::registerKernelFactory(string name, KernelFactory* factory) {
+void Platform::registerKernelFactory(const string& name, KernelFactory* factory) {
     kernelFactories[name] = factory;
 }
 
-void Platform::registerStreamFactory(string name, StreamFactory* factory) {
+void Platform::registerStreamFactory(const string& name, StreamFactory* factory) {
     streamFactories[name] = factory;
 }
 
@@ -95,13 +95,13 @@ bool Platform::supportsKernels(const vector<string>& kernelNames) const {
     return true;
 }
 
-Kernel Platform::createKernel(string name, OpenMMContextImpl& context) const {
+Kernel Platform::createKernel(const string& name, OpenMMContextImpl& context) const {
     if (kernelFactories.find(name) == kernelFactories.end())
         throw OpenMMException("Called createKernel() on a Platform which does not support the requested kernel");
     return Kernel(kernelFactories.find(name)->second->createKernelImpl(name, *this, context));
 }
 
-Stream Platform::createStream(string name, int size, Stream::DataType type, OpenMMContextImpl& context) const {
+Stream Platform::createStream(const string& name, int size, Stream::DataType type, OpenMMContextImpl& context) const {
     if (streamFactories.find(name) == streamFactories.end())
         return Stream(getDefaultStreamFactory().createStreamImpl(name, size, type, *this, context));
     return Stream(streamFactories.find(name)->second->createStreamImpl(name, size, type, *this, context));
@@ -139,7 +139,7 @@ Platform& Platform::findPlatform(const vector<string>& kernelNames) {
     return *best;
 }
 
-void Platform::loadPluginLibrary(string file) {
+void Platform::loadPluginLibrary(const string& file) {
 #ifdef WIN32
     // Tell Windows not to bother the user with ugly error boxes.
     const UINT oldErrorMode = SetErrorMode(SEM_FAILCRITICALERRORS);
@@ -157,7 +157,7 @@ void Platform::loadPluginLibrary(string file) {
 #endif
 }
 
-vector<string> Platform::loadPluginsFromDirectory(string directory) {
+vector<string> Platform::loadPluginsFromDirectory(const string& directory) {
     vector<string> files;
     char dirSeparator;
 #ifdef WIN32

platforms/brook/include/BrookPlatform.h

@@ -190,7 +190,7 @@ class OPENMM_EXPORT BrookPlatform : public Platform {
        * @return "Brook"
        */
       
-      std::string getName() const;
+      const std::string& getName() const;
 
       /** 
        * Return platform speed

platforms/brook/src/BrookPlatform.cpp

@@ -364,8 +364,9 @@ void BrookPlatform::_setBrookRuntime( const std::string& runtime ){
  * @return "Brook"
  */
     
-std::string BrookPlatform::getName() const {
-  return "Brook";
+const std::string& BrookPlatform::getName() const {
+  static const std::string name = "Brook";
+  return name;
 }   
 
 /** 

platforms/cuda/include/CudaPlatform.h

@@ -44,8 +44,9 @@ class OPENMM_EXPORT CudaPlatform : public Platform {
 public:
     class PlatformData;
     CudaPlatform();
-    std::string getName() const {
-        return "Cuda";
+    const std::string& getName() const {
+        static const std::string name = "Cuda";
+        return name;
     }
     double getSpeed() const {
         return 100;

platforms/reference/include/ReferencePlatform.h

@@ -46,8 +46,9 @@ class OPENMM_EXPORT ReferencePlatform : public Platform {
 public:
     class PlatformData;
     ReferencePlatform();
-    std::string getName() const {
-        return "Reference";
+    const std::string& getName() const {
+        static const std::string name = "Reference";
+        return name;
     }
     double getSpeed() const {
         return 1;