From: Gabe Black <gabeblack@google.com>
Date: Wed, 5 Aug 2020 05:20:19 +0000 (-0700)
Subject: systemc: Adjust some type names in a couple tests.
X-Git-Tag: v20.1.0.0~337
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=26e8d648b4d5540e9617afea15def8b540a86f3e;p=gem5.git

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 5f68240aa..e807baba9 100644
--- 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
 {
 };
 
-struct Port: sc_port<i_f>
+struct SCPort: sc_port<i_f>
 {
   Chan chan;
 };
@@ -33,7 +33,7 @@ void check_form_of_suffix(std::string s)
 
 SC_MODULE(M)
 {
-  Port port;
+  SCPort port;
 
   SC_CTOR(M)
   {
diff --git a/src/systemc/tests/systemc/compliance_1666/test234/test234.cpp b/src/systemc/tests/systemc/compliance_1666/test234/test234.cpp
index 1b5467544..4d29381d5 100644
--- 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;
 };
 
-struct Port: sc_port<i_f,0>
+struct SCPort: sc_port<i_f,0>
 {
   sc_event_finder& find_event() const
   {
@@ -27,7 +27,7 @@ struct Port: sc_port<i_f,0>
 
 SC_MODULE(M)
 {
-  Port mp;
+  SCPort mp;
   bool flag, flag2;
 
   SC_CTOR(M)