--- trunk/src/io/Globals.cpp 2005/12/02 15:38:03 770 +++ trunk/src/io/Globals.cpp 2005/12/16 18:26:41 816 @@ -45,10 +45,10 @@ #include #include "io/Globals.hpp" +#include "io/ParamConstraint.hpp" +#include "utils/MemoryUtils.hpp" #include "utils/simError.h" -#include "io/ParamConstraint.hpp" - namespace oopse { Globals::Globals() { DefineParameter(ForceField, "forceField") @@ -121,8 +121,8 @@ Globals::~Globals() { } Globals::~Globals() { - - + MemoryUtils::deletePointers(components_); + MemoryUtils::deletePointers(zconstraints_); } void Globals::validate() { @@ -205,7 +205,7 @@ bool Globals::addMoleculeStamp(MoleculeStamp* molStamp moleculeStamps_.insert(std::map::value_type(molStampName, molStamp)); ret = true; } else { - + std::cout << "Globals Error: Molecule Stamp " << molStamp->getName() << "appears multiple times\n"; } return ret; }