[ViewVC] Diff of: OpenMD/branches/development/src/io/Globals.cpp

Comparing trunk/src/io/Globals.cpp (file contents):
Revision 770 by tim, Fri Dec 2 15:38:03 2005 UTC vs.
Revision 816 by tim, Fri Dec 16 18:26:41 2005 UTC

#	Line 45 \| Line 45
45		#include <string>
46
47		#include "io/Globals.hpp"
48	+	#include "io/ParamConstraint.hpp"
49	+	#include "utils/MemoryUtils.hpp"
50		#include "utils/simError.h"
51
50	–	#include "io/ParamConstraint.hpp"
51	–
52		namespace oopse {
53		Globals::Globals() {
54		DefineParameter(ForceField, "forceField")
#	Line 121 \| Line 121 \| Globals::~Globals() {
121		}
122
123		Globals::~Globals() {
124	<
125	<
124	>	MemoryUtils::deletePointers(components_);
125	>	MemoryUtils::deletePointers(zconstraints_);
126		}
127
128		void Globals::validate() {
#	Line 205 \| Line 205 \| *bool Globals::addMoleculeStamp(MoleculeStamp molStamp**
205		moleculeStamps_.insert(std::map<std::string, MoleculeStamp*>::value_type(molStampName, molStamp));
206		ret = true;
207		} else {
208	<
208	>	std::cout << "Globals Error: Molecule Stamp " << molStamp->getName() << "appears multiple times\n";
209		}
210		return ret;
211		}

-–
+Removed lines
-+
+Added lines
-<
+Changed lines
->
+Changed lines