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>
This commit is contained in:
Gabe Black
2020-08-04 22:20:19 -07:00
parent d621325db0
commit 26e8d648b4
2 changed files with 4 additions and 4 deletions

View File

@@ -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)
{

View File

@@ -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)