174c174
< paramOut(ostream &os, const std::string &name, const T &param)
---
> paramOut(ostream &os, const string &name, const T &param)
183,184c183
< arrayParamOut(ostream &os, const std::string &name,
< const std::vector<T> &param)
---
> arrayParamOut(ostream &os, const string &name, const vector<T> &param)
200,201c199
< paramIn(Checkpoint *cp, const std::string &section,
< const std::string &name, T &param)
---
> paramIn(Checkpoint *cp, const string &section, const string &name, T &param)
203c201
< std::string str;
---
> string str;
212,213c210
< arrayParamOut(ostream &os, const std::string &name,
< const T *param, int size)
---
> arrayParamOut(ostream &os, const string &name, const T *param, int size)
228,229c225,226
< arrayParamIn(Checkpoint *cp, const std::string &section,
< const std::string &name, T *param, int size)
---
> arrayParamIn(Checkpoint *cp, const string &section, const string &name,
> T *param, int size)
231c228
< std::string str;
---
> string str;
272,273c269,270
< arrayParamIn(Checkpoint *cp, const std::string &section,
< const std::string &name, std::vector<T> &param)
---
> arrayParamIn(Checkpoint *cp, const string &section,
> const string &name, vector<T> &param)
275c272
< std::string str;
---
> string str;
315,316c312,313
< objParamIn(Checkpoint *cp, const std::string &section,
< const std::string &name, SimObject * &param)
---
> objParamIn(Checkpoint *cp, const string &section,
> const string &name, SimObject * &param)
326c323
< paramOut(ostream &os, const std::string &name, type const &param); \
---
> paramOut(ostream &os, const string &name, type const &param); \
328,329c325,326
< paramIn(Checkpoint *cp, const std::string &section, \
< const std::string &name, type & param); \
---
> paramIn(Checkpoint *cp, const string &section, \
> const string &name, type & param); \
331c328
< arrayParamOut(ostream &os, const std::string &name, \
---
> arrayParamOut(ostream &os, const string &name, \
334,335c331,332
< arrayParamIn(Checkpoint *cp, const std::string &section, \
< const std::string &name, type *param, int size); \
---
> arrayParamIn(Checkpoint *cp, const string &section, \
> const string &name, type *param, int size); \
337,338c334,335
< arrayParamOut(ostream &os, const std::string &name, \
< const std::vector<type> &param); \
---
> arrayParamOut(ostream &os, const string &name, \
> const vector<type> &param); \
340,341c337,338
< arrayParamIn(Checkpoint *cp, const std::string &section, \
< const std::string &name, std::vector<type> &param);
---
> arrayParamIn(Checkpoint *cp, const string &section, \
> const string &name, vector<type> &param);
408c405
< Serializable::serialize(std::ostream &os)
---
> Serializable::serialize(ostream &os)
413c410
< Serializable::unserialize(Checkpoint *cp, const std::string &section)
---
> Serializable::unserialize(Checkpoint *cp, const string &section)
418c415
< Serializable::serializeAll(const std::string &cpt_dir)
---
> Serializable::serializeAll(const string &cpt_dir)
437c434
< Serializable::unserializeAll(const std::string &cpt_dir)
---
> Serializable::unserializeAll(const string &cpt_dir)
462c459
< setCheckpointDir(const std::string &name)
---
> setCheckpointDir(const string &name)
479c476
< debug_serialize(const std::string &cpt_dir)
---
> debug_serialize(const string &cpt_dir)
495c492
< map<string,SerializableClass::CreateFunc> *SerializableClass::classMap = 0;
---
> map<string, SerializableClass::CreateFunc> *SerializableClass::classMap = 0;
499c496
< CreateFunc createFunc)
---
> CreateFunc createFunc)
502c499
< classMap = new map<string,SerializableClass::CreateFunc>();
---
> classMap = new map<string, SerializableClass::CreateFunc>();
505,509c502
< {
< cerr << "Error: simulation object class " << className << " redefined"
< << endl;
< fatal("");
< }
---
> fatal("Error: simulation object class %s redefined\n", className);
515d507
<
519,520c511
< SerializableClass::createObject(Checkpoint *cp,
< const std::string &section)
---
> SerializableClass::createObject(Checkpoint *cp, const string &section)
545c536
< Serializable::create(Checkpoint *cp, const std::string &section)
---
> Serializable::create(Checkpoint *cp, const string &section)
553c544
< Checkpoint::Checkpoint(const std::string &cpt_dir, const std::string &path)
---
> Checkpoint::Checkpoint(const string &cpt_dir, const string &path)
564,565c555
< Checkpoint::find(const std::string &section, const std::string &entry,
< std::string &value)
---
> Checkpoint::find(const string &section, const string &entry, string &value)
572c562
< Checkpoint::findObj(const std::string &section, const std::string &entry,
---
> Checkpoint::findObj(const string &section, const string &entry,
586c576
< Checkpoint::sectionExists(const std::string &section)
---
> Checkpoint::sectionExists(const string &section)