From 2ab51fbcdb1d26d635875174eb23f60d6f9dc6bb Mon Sep 17 00:00:00 2001 From: Andrew Schultz Date: Fri, 31 Oct 2003 17:32:04 -0500 Subject: Changed the naming of Serializeable derived objects. Serializeable no longer has objName as a member, instead it has the pure virtual function name(). SimObject now has a objName member, and all classes derived directly from Serializeable have to implement a name() function (which now makes them unique by pointer value) cpu/simple_cpu/simple_cpu.cc: Change initialization of Event to get rid of Serializeable naming dev/etherlink.cc: dev/etherlink.hh: Seralizeable derived naming changes sim/eventq.cc: Serializeable derived naming changes, also changed serialization process so it doesn't need to use nameChildren sim/eventq.hh: Serializeable derived naming changes, remove constructor for specifying event name sim/serialize.cc: Serializeable derived naming changes, remove setName function and the child naming pass for serialization sim/serialize.hh: Serializeable derived naming changes, removed nameChildren, setName sim/sim_object.cc: sim/sim_object.hh: Serializeable derived naming changes --HG-- extra : convert_revision : 67bcc275b6c210f7049f98a1ad0d22e8f5596a63 --- sim/sim_object.hh | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'sim/sim_object.hh') diff --git a/sim/sim_object.hh b/sim/sim_object.hh index 20da07164..1a365651b 100644 --- a/sim/sim_object.hh +++ b/sim/sim_object.hh @@ -47,6 +47,9 @@ */ class SimObject : public Serializeable { + protected: + std::string objName; + private: friend class Serializer; @@ -60,6 +63,8 @@ class SimObject : public Serializeable virtual ~SimObject() {} + virtual std::string name() const { return objName; } + // register statistics for this object virtual void regStats(); virtual void regFormulas(); -- cgit v1.2.3