Commit 62cf58b8 authored by Elizabeth's avatar Elizabeth
Browse files

Removing unnecessary sstream import and adding new commentary on loadPluginsFromDirectory()

parent dd027667
...@@ -35,7 +35,6 @@ ...@@ -35,7 +35,6 @@
#include <map> #include <map>
#include <string> #include <string>
#include <vector> #include <vector>
#include <sstream>
#include "openmm/internal/windowsExport.h" #include "openmm/internal/windowsExport.h"
namespace OpenMM { namespace OpenMM {
...@@ -228,6 +227,13 @@ public: ...@@ -228,6 +227,13 @@ public:
* OPENMM_PLUGIN_DIR is set, this returns its value. Otherwise, it returns a platform * OPENMM_PLUGIN_DIR is set, this returns its value. Otherwise, it returns a platform
* specific default location. * specific default location.
* *
* On unix-like systems, OPENMM_PLUGIN_DIR is allowed to either be a
* single, fully-qualified path (e.g., /foo/plugins) or a ':'-concatenated
* set of fully-qualified paths (e.g., /foo/plugins:bar/plugins). On
* windows-like systems, the same is true, but the path separator is '\\'
* and the path concatenator is ';'. If an identically-named plugin is
* encountered twice it will be loaded at both points; be careful!!!
*
* @return the path to the default plugin directory * @return the path to the default plugin directory
*/ */
static const std::string& getDefaultPluginsDirectory(); static const std::string& getDefaultPluginsDirectory();
......
...@@ -37,7 +37,6 @@ ...@@ -37,7 +37,6 @@
#include "openmm/internal/ContextImpl.h" #include "openmm/internal/ContextImpl.h"
#ifdef WIN32 #ifdef WIN32
#include <windows.h> #include <windows.h>
#include <sstream>
#else #else
#ifndef __PNACL__ #ifndef __PNACL__
#include <dlfcn.h> #include <dlfcn.h>
...@@ -45,6 +44,7 @@ ...@@ -45,6 +44,7 @@
#include <dirent.h> #include <dirent.h>
#include <cstdlib> #include <cstdlib>
#endif #endif
#include <sstream>
#include <set> #include <set>
#include <algorithm> #include <algorithm>
......
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