113c113,114
< sc_gem5::pickUniqueName(parent, _basename);
---
> std::string original_name = _basename;
> _basename = sc_gem5::pickUniqueName(parent, original_name);
122d122
< _name = _basename;
123a124
> std::string path = "";
125c126
< _name = std::string(sc_p->basename()) + std::string(".") + _name;
---
> path = std::string(sc_p->basename()) + std::string(".") + path;
127a129,136
>
> if (_basename != original_name) {
> std::string message = path + original_name +
> ". Latter declaration will be renamed to " +
> path + _basename;
> SC_REPORT_WARNING("(W505) object already exists", message.c_str());
> }
> _name = path + _basename;
262,263c271,272
< void
< Object::pickUniqueName(std::string &base)
---
> std::string
> Object::pickUniqueName(std::string base)
267a277,278
>
> return base;
270,271c281,282
< void
< pickUniqueName(::sc_core::sc_object *parent, std::string &base)
---
> std::string
> pickUniqueName(::sc_core::sc_object *parent, std::string base)
273,276c284,285
< if (parent) {
< Object::getFromScObject(parent)->pickUniqueName(base);
< return;
< }
---
> if (parent)
> return Object::getFromScObject(parent)->pickUniqueName(base);
280a290,291
>
> return base;