85c85
< #define SERIALIZE_SCALAR(scalar) paramOut(os, #scalar, scalar)
---
> #define SERIALIZE_SCALAR(scalar) paramOut(os, #scalar, scalar)
87c87
< #define UNSERIALIZE_SCALAR(scalar) paramIn(cp, section, #scalar, scalar)
---
> #define UNSERIALIZE_SCALAR(scalar) paramIn(cp, section, #scalar, scalar)
90c90
< #define SERIALIZE_ENUM(scalar) paramOut(os, #scalar, (int)scalar)
---
> #define SERIALIZE_ENUM(scalar) paramOut(os, #scalar, (int)scalar)
92,96c92,96
< #define UNSERIALIZE_ENUM(scalar) \
< do { \
< int tmp; \
< paramIn(cp, section, #scalar, tmp); \
< scalar = (typeof(scalar))tmp; \
---
> #define UNSERIALIZE_ENUM(scalar) \
> do { \
> int tmp; \
> paramIn(cp, section, #scalar, tmp); \
> scalar = (typeof(scalar))tmp; \
99c99
< #define SERIALIZE_ARRAY(member, size) \
---
> #define SERIALIZE_ARRAY(member, size) \
102c102
< #define UNSERIALIZE_ARRAY(member, size) \
---
> #define UNSERIALIZE_ARRAY(member, size) \
105c105
< #define SERIALIZE_OBJPTR(objptr) paramOut(os, #objptr, (objptr)->name())
---
> #define SERIALIZE_OBJPTR(objptr) paramOut(os, #objptr, (objptr)->name())
107,111c107,111
< #define UNSERIALIZE_OBJPTR(objptr) \
< do { \
< SimObject *sptr; \
< objParamIn(cp, section, #objptr, sptr); \
< objptr = dynamic_cast<typeof(objptr)>(sptr); \
---
> #define UNSERIALIZE_OBJPTR(objptr) \
> do { \
> SimObject *sptr; \
> objParamIn(cp, section, #objptr, sptr); \
> objptr = dynamic_cast<typeof(objptr)>(sptr); \
214,215c214,215
< #define REGISTER_SERIALIZEABLE(CLASS_NAME, OBJ_CLASS) \
< SerializableClass the##OBJ_CLASS##Class(CLASS_NAME, \
---
> #define REGISTER_SERIALIZEABLE(CLASS_NAME, OBJ_CLASS) \
> SerializableClass the##OBJ_CLASS##Class(CLASS_NAME, \