[gem5-dev] Change in gem5/gem5[master]: systemc: Handle null sc_object names.

[Gabe Black (Gerrit)]

Gabe Black has uploaded this change for review. (  
https://gem5-review.googlesource.com/c/public/gem5/+/12257

Change subject: systemc: Handle null sc_object names.
......................................................................

systemc: Handle null sc_object names.

A null pointer for an sc_object name is supposed to be equivalent to
an empty string.

Change-Id: I6094577ad43f13d47a20bc67fa15f4c04d448fe5
---
M src/systemc/core/object.cc
1 file changed, 1 insertion(+), 1 deletion(-)



diff --git a/src/systemc/core/object.cc b/src/systemc/core/object.cc
index e066a23..1fb1d45 100644
--- a/src/systemc/core/object.cc
+++ b/src/systemc/core/object.cc
@@ -72,7 +72,7 @@
 Object::Object(sc_core::sc_object *_sc_obj) : Object(_sc_obj, "object") {}

 Object::Object(sc_core::sc_object *_sc_obj, const char *obj_name) :
-    _sc_obj(_sc_obj), _basename(obj_name), parent(nullptr)
+    _sc_obj(_sc_obj), _basename(obj_name ? obj_name : ""), parent(nullptr)
 {
     if (_basename == "")
         _basename = "object";

--
To view, visit https://gem5-review.googlesource.com/c/public/gem5/+/12257
To unsubscribe, or for help writing mail filters, visit  
https://gem5-review.googlesource.com/settings

Gerrit-Project: public/gem5
Gerrit-Branch: master
Gerrit-Change-Id: I6094577ad43f13d47a20bc67fa15f4c04d448fe5
Gerrit-Change-Number: 12257
Gerrit-PatchSet: 1
Gerrit-Owner: Gabe Black <gabebl...@google.com>
Gerrit-MessageType: newchange
_______________________________________________
gem5-dev mailing list
gem5-dev@gem5.org
http://m5sim.org/mailman/listinfo/gem5-dev