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

Moved reference platform classes into OpenMM namespace

parent 8148f51d
...@@ -37,10 +37,10 @@ ...@@ -37,10 +37,10 @@
#include "fftpack.h" #include "fftpack.h"
using std::vector; using std::vector;
using OpenMM::RealVec;
typedef int ivec[3]; typedef int ivec[3];
namespace OpenMM {
struct pme struct pme
{ {
...@@ -729,3 +729,5 @@ pme_destroy(pme_t pme) ...@@ -729,3 +729,5 @@ pme_destroy(pme_t pme)
return 0; return 0;
} }
} // namespace OpenMM
...@@ -31,6 +31,8 @@ ...@@ -31,6 +31,8 @@
#include "ReferenceForce.h" #include "ReferenceForce.h"
#include "ReferencePairIxn.h" #include "ReferencePairIxn.h"
using namespace OpenMM;
/**--------------------------------------------------------------------------------------- /**---------------------------------------------------------------------------------------
ReferencePairIxn constructor ReferencePairIxn constructor
......
...@@ -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;
/**--------------------------------------------------------------------------------------- /**---------------------------------------------------------------------------------------
......
...@@ -34,7 +34,7 @@ ...@@ -34,7 +34,7 @@
#include <cstdio> #include <cstdio>
using std::vector; using std::vector;
using OpenMM::RealVec; using namespace OpenMM;
/**--------------------------------------------------------------------------------------- /**---------------------------------------------------------------------------------------
......
...@@ -35,7 +35,7 @@ ...@@ -35,7 +35,7 @@
#include <cstdio> #include <cstdio>
using std::vector; using std::vector;
using OpenMM::RealVec; using namespace OpenMM;
/**--------------------------------------------------------------------------------------- /**---------------------------------------------------------------------------------------
......
...@@ -33,7 +33,7 @@ ...@@ -33,7 +33,7 @@
#include "ReferenceVirtualSites.h" #include "ReferenceVirtualSites.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;
/**--------------------------------------------------------------------------------------- /**---------------------------------------------------------------------------------------
......
...@@ -24,6 +24,8 @@ ...@@ -24,6 +24,8 @@
#include "SimTKOpenMMCommon.h" #include "SimTKOpenMMCommon.h"
using namespace OpenMM;
// static settings // static settings
// initialization of static data members // initialization of static data members
......
...@@ -26,6 +26,8 @@ ...@@ -26,6 +26,8 @@
#include <stdlib.h> #include <stdlib.h>
#include "openmm/OpenMMException.h" #include "openmm/OpenMMException.h"
using namespace OpenMM;
// static settings // static settings
SimTKOpenMMLog* SimTKOpenMMLog::_simTKOpenMMLog = NULL; SimTKOpenMMLog* SimTKOpenMMLog::_simTKOpenMMLog = NULL;
......
...@@ -36,6 +36,8 @@ ...@@ -36,6 +36,8 @@
#include <string.h> #include <string.h>
#include <iostream> #include <iostream>
using namespace OpenMM;
uint32_t SimTKOpenMMUtilities::_randomNumberSeed = 0; uint32_t SimTKOpenMMUtilities::_randomNumberSeed = 0;
bool SimTKOpenMMUtilities::_randomInitialized = false; bool SimTKOpenMMUtilities::_randomInitialized = false;
bool SimTKOpenMMUtilities::nextGaussianIsValid = false; bool SimTKOpenMMUtilities::nextGaussianIsValid = false;
......
...@@ -31,7 +31,7 @@ ...@@ -31,7 +31,7 @@
#include "SimTKOpenMMCommon.h" #include "SimTKOpenMMCommon.h"
using std::vector; using std::vector;
using OpenMM::RealVec; using namespace OpenMM;
/**--------------------------------------------------------------------------------------- /**---------------------------------------------------------------------------------------
......
...@@ -31,6 +31,7 @@ ...@@ -31,6 +31,7 @@
#include "SimTKOpenMMCommon.h" #include "SimTKOpenMMCommon.h"
using std::vector; using std::vector;
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