Gabe Black has uploaded this change for review. (
https://gem5-review.googlesource.com/c/public/gem5/+/32175 )
Change subject: systemc: Adjust some type names in a couple tests.
......................................................................
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
---
M src/systemc/tests/systemc/compliance_1666/test200/test200.cpp
M src/systemc/tests/systemc/compliance_1666/test234/test234.cpp
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/systemc/tests/systemc/compliance_1666/test200/test200.cpp
b/src/systemc/tests/systemc/compliance_1666/test200/test200.cpp
index 5f68240..e807bab 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 Port: sc_port<i_f>
+struct SCPort: sc_port<i_f>
{
Chan chan;
};
@@ -33,7 +33,7 @@
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 1b54675..4d29381 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 @@
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 @@
SC_MODULE(M)
{
- Port mp;
+ SCPort mp;
bool flag, flag2;
SC_CTOR(M)
--
To view, visit https://gem5-review.googlesource.com/c/public/gem5/+/32175
To unsubscribe, or for help writing mail filters, visit
https://gem5-review.googlesource.com/settings
Gerrit-Project: public/gem5
Gerrit-Branch: develop
Gerrit-Change-Id: Ie7c5f2236678d5dbb722a86321296fce395fbd37
Gerrit-Change-Number: 32175
Gerrit-PatchSet: 1
Gerrit-Owner: Gabe Black <gabebl...@google.com>
Gerrit-MessageType: newchange
_______________________________________________
gem5-dev mailing list -- gem5-dev@gem5.org
To unsubscribe send an email to gem5-dev-le...@gem5.org
%(web_page_url)slistinfo%(cgiext)s/%(_internal_name)s
