70c70
< Object::Object(sc_core::sc_object *sc_obj) : Object(sc_obj, "object") {}
---
> Object::Object(sc_core::sc_object *_sc_obj) : Object(_sc_obj, "object") {}
72,73c72,73
< Object::Object(sc_core::sc_object *sc_obj, const char *obj_name) :
< sc_obj(sc_obj), _basename(obj_name), parent(nullptr)
---
> Object::Object(sc_core::sc_object *_sc_obj, const char *obj_name) :
> _sc_obj(_sc_obj), _basename(obj_name), parent(nullptr)
89,90c89,90
< parent = p->obj()->sc_obj;
< addObject(&parent->_gem5_object->children, sc_obj);
---
> parent = p->obj()->_sc_obj;
> addObject(&parent->_gem5_object->children, _sc_obj);
96c96
< addObject(&topLevelObjects, sc_obj);
---
> addObject(&topLevelObjects, _sc_obj);
99c99
< addObject(&allObjects, sc_obj);
---
> addObject(&allObjects, _sc_obj);
109,110c109,110
< Object::Object(sc_core::sc_object *sc_obj, const Object &arg) :
< Object(sc_obj, arg._basename.c_str())
---
> Object::Object(sc_core::sc_object *_sc_obj, const Object &arg) :
> Object(_sc_obj, arg._basename.c_str())
152c152
< out << "kind = " << sc_obj->kind() << "\n";
---
> out << "kind = " << _sc_obj->kind() << "\n";
220a221,225
> EventsIt
> Object::addChildEvent(sc_core::sc_event *e)
> {
> return events.emplace(events.end(), e);
> }
221a227,234
> void
> Object::delChildEvent(EventsIt it)
> {
> std::swap(*it, events.back());
> events.pop_back();
> }
>
>