systemc: Adjust some type names in a couple tests.

These names happened to collide with names from gem5 itself, and when
linked together produced strange and incorrect results.

Ideally gem5's names should go inside a gem5 namespace, but that's a
much larger change.

Change-Id: Ie7c5f2236678d5dbb722a86321296fce395fbd37
Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/32175
Reviewed-by: Bobby R. Bruce <bbruce@ucdavis.edu>
Reviewed-by: Jason Lowe-Power <power.jg@gmail.com>
Maintainer: Jason Lowe-Power <power.jg@gmail.com>
Tested-by: kokoro <noreply+kokoro@google.com>

diff --git a/src/systemc/tests/systemc/compliance_1666/test200/test200.cpp b/src/systemc/tests/systemc/compliance_1666/test200/test200.cpp
index 5f68240aaf53b7fc4fc337fef512fd4eb7174ca1..e807baba9b8264ddb83ab82d2059ed2563cc0de0 100644 (file)
--- a/src/systemc/tests/systemc/compliance_1666/test200/test200.cpp
+++ b/src/systemc/tests/systemc/compliance_1666/test200/test200.cpp
@@ -10,7 +10,7 @@ struct Chan: i_f, sc_object
 {\r
 };\r
 \r
-struct Port: sc_port<i_f>\r
+struct SCPort: sc_port<i_f>\r
 {\r
   Chan chan;\r
 };\r
@@ -33,7 +33,7 @@ void check_form_of_suffix(std::string s)
 \r
 SC_MODULE(M)\r
 {\r
-  Port port;\r
+  SCPort port;\r
 \r
   SC_CTOR(M)\r
   {\r

diff --git a/src/systemc/tests/systemc/compliance_1666/test234/test234.cpp b/src/systemc/tests/systemc/compliance_1666/test234/test234.cpp
index 1b546754471c588f9e0e774caae1c798dcf97b5d..4d29381d56cc9a26c28600fa4aec16ae1de93124 100644 (file)
--- a/src/systemc/tests/systemc/compliance_1666/test234/test234.cpp
+++ b/src/systemc/tests/systemc/compliance_1666/test234/test234.cpp
@@ -17,7 +17,7 @@ struct Chan: i_f, sc_object
   sc_event ev;\r
 };\r
 \r
-struct Port: sc_port<i_f,0>\r
+struct SCPort: sc_port<i_f,0>\r
 {\r
   sc_event_finder& find_event() const\r
   {\r
@@ -27,7 +27,7 @@ struct Port: sc_port<i_f,0>
 \r
 SC_MODULE(M)\r
 {\r
-  Port mp;\r
+  SCPort mp;\r
   bool flag, flag2;\r
 \r
   SC_CTOR(M)\r