Nikos Nikoleris has submitted this change and it was merged. (
https://gem5-review.googlesource.com/c/public/gem5/+/15135 )
Change subject: systemc: Allow specific functions to shadow the base class
method
......................................................................
systemc: Allow specific functions to shadow the base class method
sc_in::bind and sc_core::sc_object::print shadow their respective base
class method. This change adds the necessary declarations to inform
the compiler that this is intentional.
Change-Id: I8c6bc0f05aa568630783db63d52be90f4ea4748c
Signed-off-by: Nikos Nikoleris <[email protected]>
Reviewed-on: https://gem5-review.googlesource.com/c/15135
Reviewed-by: Gabe Black <[email protected]>
Maintainer: Gabe Black <[email protected]>
---
M src/systemc/ext/channel/sc_in.hh
M util/systemc/systemc_within_gem5/systemc_sc_main/sc_main.cc
2 files changed, 2 insertions(+), 0 deletions(-)
Approvals:
Gabe Black: Looks good to me, approved; Looks good to me, approved
diff --git a/src/systemc/ext/channel/sc_in.hh
b/src/systemc/ext/channel/sc_in.hh
index 85d089d..36547c2 100644
--- a/src/systemc/ext/channel/sc_in.hh
+++ b/src/systemc/ext/channel/sc_in.hh
@@ -83,6 +83,7 @@
_valueChangedFinder(*this,
&sc_signal_in_if<T>::value_changed_event)
{}
+ using sc_port<sc_signal_in_if<T>, 1>::bind;
virtual void
bind(const sc_signal_in_if<T> &i)
{
diff --git a/util/systemc/systemc_within_gem5/systemc_sc_main/sc_main.cc
b/util/systemc/systemc_within_gem5/systemc_sc_main/sc_main.cc
index 13da38c..5de1bca 100644
--- a/util/systemc/systemc_within_gem5/systemc_sc_main/sc_main.cc
+++ b/util/systemc/systemc_within_gem5/systemc_sc_main/sc_main.cc
@@ -43,6 +43,7 @@
SC_THREAD(print);
}
+ using sc_core::sc_object::print;
void
print()
{
--
To view, visit https://gem5-review.googlesource.com/c/public/gem5/+/15135
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: I8c6bc0f05aa568630783db63d52be90f4ea4748c
Gerrit-Change-Number: 15135
Gerrit-PatchSet: 2
Gerrit-Owner: Nikos Nikoleris <[email protected]>
Gerrit-Reviewer: Gabe Black <[email protected]>
Gerrit-Reviewer: Nikos Nikoleris <[email protected]>
Gerrit-MessageType: merged
_______________________________________________
gem5-dev mailing list
[email protected]
http://m5sim.org/mailman/listinfo/gem5-dev
