diff options
Diffstat (limited to 'src/sim/serialize.hh')
-rw-r--r-- | src/sim/serialize.hh | 15 |
1 files changed, 13 insertions, 2 deletions
diff --git a/src/sim/serialize.hh b/src/sim/serialize.hh index 12b787a5e..bc64e74f8 100644 --- a/src/sim/serialize.hh +++ b/src/sim/serialize.hh @@ -89,6 +89,17 @@ void objParamIn(Checkpoint *cp, const std::string §ion, const std::string &name, SimObject * ¶m); +template <typename T> +void fromInt(T &t, int i) +{ + t = (T)i; +} + +template <typename T> +void fromSimObject(T &t, SimObject *s) +{ + t = dynamic_cast<T>(s); +} // // These macros are streamlined to use in serialize/unserialize @@ -106,7 +117,7 @@ objParamIn(Checkpoint *cp, const std::string §ion, do { \ int tmp; \ paramIn(cp, section, #scalar, tmp); \ - scalar = (typeof(scalar))tmp; \ + fromInt(scalar, tmp); \ } while (0) #define SERIALIZE_ARRAY(member, size) \ @@ -121,7 +132,7 @@ objParamIn(Checkpoint *cp, const std::string §ion, do { \ SimObject *sptr; \ objParamIn(cp, section, #objptr, sptr); \ - objptr = dynamic_cast<typeof(objptr)>(sptr); \ + fromSimObject(objptr, sptr); \ } while (0) /* |