Commit 9111cca0 authored by peastman's avatar peastman
Browse files

Moved reference platform classes into OpenMM namespace

parent 8148f51d
...@@ -25,18 +25,11 @@ ...@@ -25,18 +25,11 @@
#ifndef __SimTKOpenMMCommon_H__ #ifndef __SimTKOpenMMCommon_H__
#define __SimTKOpenMMCommon_H__ #define __SimTKOpenMMCommon_H__
// include file containing entries commonly used
// STL includes
#include <vector> #include <vector>
#include <string> #include <string>
// ---------------------------------------------------------------------------------------
#include "RealVec.h" #include "RealVec.h"
// --------------------------------------------------------------------------------------- namespace OpenMM {
typedef std::vector<RealOpenMM> RealOpenMMVector; typedef std::vector<RealOpenMM> RealOpenMMVector;
typedef RealOpenMMVector::iterator RealOpenMMVectorI; typedef RealOpenMMVector::iterator RealOpenMMVectorI;
...@@ -62,4 +55,6 @@ class SimTKOpenMMCommon { ...@@ -62,4 +55,6 @@ class SimTKOpenMMCommon {
static const int ErrorReturn; static const int ErrorReturn;
}; };
} // namespace OpenMM
#endif // __SimTKOpenMMCommon_H__ #endif // __SimTKOpenMMCommon_H__
...@@ -30,6 +30,8 @@ ...@@ -30,6 +30,8 @@
#include "SimTKOpenMMCommon.h" #include "SimTKOpenMMCommon.h"
#include "openmm/internal/windowsExport.h" #include "openmm/internal/windowsExport.h"
namespace OpenMM {
/** --------------------------------------------------------------------------------------- /** ---------------------------------------------------------------------------------------
SimTKOpenMMLog class used for logging SimTKOpenMMLog class used for logging
...@@ -182,4 +184,6 @@ class OPENMM_EXPORT SimTKOpenMMLog { ...@@ -182,4 +184,6 @@ class OPENMM_EXPORT SimTKOpenMMLog {
}; };
} // namespace OpenMM
#endif //__SimTKOpenMMLog_H__ #endif //__SimTKOpenMMLog_H__
...@@ -33,6 +33,8 @@ ...@@ -33,6 +33,8 @@
#include <string> #include <string>
namespace OpenMM {
/**--------------------------------------------------------------------------------------- /**---------------------------------------------------------------------------------------
Class of static methods to be shared Class of static methods to be shared
...@@ -220,6 +222,6 @@ class OPENMM_EXPORT SimTKOpenMMUtilities { ...@@ -220,6 +222,6 @@ class OPENMM_EXPORT SimTKOpenMMUtilities {
static void loadCheckpoint(std::istream& stream); static void loadCheckpoint(std::istream& stream);
}; };
// --------------------------------------------------------------------------------------- } // namespace OpenMM
#endif // __SimTKOpenMMUtilities_H__ #endif // __SimTKOpenMMUtilities_H__
...@@ -29,7 +29,7 @@ ...@@ -29,7 +29,7 @@
#include "ReferenceAndersenThermostat.h" #include "ReferenceAndersenThermostat.h"
using std::vector; using std::vector;
using OpenMM::RealVec; using namespace OpenMM;
/**--------------------------------------------------------------------------------------- /**---------------------------------------------------------------------------------------
......
...@@ -32,7 +32,7 @@ ...@@ -32,7 +32,7 @@
#include "ReferenceForce.h" #include "ReferenceForce.h"
using std::vector; using std::vector;
using OpenMM::RealVec; using namespace OpenMM;
/**--------------------------------------------------------------------------------------- /**---------------------------------------------------------------------------------------
......
...@@ -31,7 +31,7 @@ ...@@ -31,7 +31,7 @@
#include "ReferenceBondForce.h" #include "ReferenceBondForce.h"
using std::vector; using std::vector;
using OpenMM::RealVec; using namespace OpenMM;
/**--------------------------------------------------------------------------------------- /**---------------------------------------------------------------------------------------
......
...@@ -32,7 +32,7 @@ ...@@ -32,7 +32,7 @@
#include "ReferenceBondIxn.h" #include "ReferenceBondIxn.h"
using std::vector; using std::vector;
using OpenMM::RealVec; using namespace OpenMM;
/**--------------------------------------------------------------------------------------- /**---------------------------------------------------------------------------------------
......
...@@ -34,7 +34,7 @@ ...@@ -34,7 +34,7 @@
#include <cstdio> #include <cstdio>
using std::vector; using std::vector;
using OpenMM::RealVec; using namespace OpenMM;
/**--------------------------------------------------------------------------------------- /**---------------------------------------------------------------------------------------
......
...@@ -39,9 +39,7 @@ using std::map; ...@@ -39,9 +39,7 @@ using std::map;
using std::pair; using std::pair;
using std::vector; using std::vector;
using std::set; using std::set;
using OpenMM::OpenMMException; using namespace OpenMM;
using OpenMM::Vec3;
using OpenMM::RealVec;
ReferenceCCMAAlgorithm::ReferenceCCMAAlgorithm(int numberOfAtoms, ReferenceCCMAAlgorithm::ReferenceCCMAAlgorithm(int numberOfAtoms,
int numberOfConstraints, int numberOfConstraints,
......
...@@ -26,7 +26,7 @@ ...@@ -26,7 +26,7 @@
#include "ReferenceForce.h" #include "ReferenceForce.h"
using std::vector; using std::vector;
using OpenMM::RealVec; using namespace OpenMM;
/**--------------------------------------------------------------------------------------- /**---------------------------------------------------------------------------------------
......
...@@ -37,7 +37,7 @@ using std::pair; ...@@ -37,7 +37,7 @@ using std::pair;
using std::string; using std::string;
using std::stringstream; using std::stringstream;
using std::vector; using std::vector;
using OpenMM::RealVec; using namespace OpenMM;
/**--------------------------------------------------------------------------------------- /**---------------------------------------------------------------------------------------
......
...@@ -36,7 +36,7 @@ using std::set; ...@@ -36,7 +36,7 @@ using std::set;
using std::string; using std::string;
using std::stringstream; using std::stringstream;
using std::vector; using std::vector;
using OpenMM::RealVec; using namespace OpenMM;
/**--------------------------------------------------------------------------------------- /**---------------------------------------------------------------------------------------
......
...@@ -38,7 +38,7 @@ using std::set; ...@@ -38,7 +38,7 @@ using std::set;
using std::string; using std::string;
using std::stringstream; using std::stringstream;
using std::vector; using std::vector;
using OpenMM::RealVec; using namespace OpenMM;
/**--------------------------------------------------------------------------------------- /**---------------------------------------------------------------------------------------
......
...@@ -37,7 +37,7 @@ using std::string; ...@@ -37,7 +37,7 @@ using std::string;
using std::stringstream; using std::stringstream;
using std::set; using std::set;
using std::vector; using std::vector;
using OpenMM::RealVec; using namespace OpenMM;
/**--------------------------------------------------------------------------------------- /**---------------------------------------------------------------------------------------
......
...@@ -33,7 +33,7 @@ ...@@ -33,7 +33,7 @@
#include <cstdio> #include <cstdio>
using std::vector; using std::vector;
using OpenMM::RealVec; using namespace OpenMM;
/**--------------------------------------------------------------------------------------- /**---------------------------------------------------------------------------------------
......
...@@ -32,7 +32,7 @@ ...@@ -32,7 +32,7 @@
#include <cstdio> #include <cstdio>
using OpenMM::RealVec; using namespace OpenMM;
/**--------------------------------------------------------------------------------------- /**---------------------------------------------------------------------------------------
......
...@@ -32,7 +32,7 @@ ...@@ -32,7 +32,7 @@
#include "ReferenceForce.h" #include "ReferenceForce.h"
using std::vector; using std::vector;
using OpenMM::RealVec; using namespace OpenMM;
/**--------------------------------------------------------------------------------------- /**---------------------------------------------------------------------------------------
......
...@@ -32,7 +32,7 @@ ...@@ -32,7 +32,7 @@
#include "ReferenceForce.h" #include "ReferenceForce.h"
using std::vector; using std::vector;
using OpenMM::RealVec; using namespace OpenMM;
/**--------------------------------------------------------------------------------------- /**---------------------------------------------------------------------------------------
......
...@@ -40,7 +40,7 @@ ...@@ -40,7 +40,7 @@
using std::set; using std::set;
using std::vector; using std::vector;
using OpenMM::RealVec; using namespace OpenMM;
/**--------------------------------------------------------------------------------------- /**---------------------------------------------------------------------------------------
......
...@@ -32,7 +32,7 @@ ...@@ -32,7 +32,7 @@
#include "openmm/OpenMMException.h" #include "openmm/OpenMMException.h"
using std::vector; using std::vector;
using OpenMM::RealVec; using namespace OpenMM;
/**--------------------------------------------------------------------------------------- /**---------------------------------------------------------------------------------------
......
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