From 1001d247968b31f803b9dcd4f527e34ebe27c182 Mon Sep 17 00:00:00 2001
From: Nikos Nikoleris <nikos.nikoleris@arm.com>
Date: Mon, 17 Dec 2018 15:50:04 +0000
Subject: [PATCH] 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 <nikos.nikoleris@arm.com>
Reviewed-on: https://gem5-review.googlesource.com/c/15135
Reviewed-by: Gabe Black <gabeblack@google.com>
Maintainer: Gabe Black <gabeblack@google.com>
---
 src/systemc/ext/channel/sc_in.hh                            | 1 +
 util/systemc/systemc_within_gem5/systemc_sc_main/sc_main.cc | 1 +
 2 files changed, 2 insertions(+)

diff --git a/src/systemc/ext/channel/sc_in.hh b/src/systemc/ext/channel/sc_in.hh
index 85d089dbc..36547c21e 100644
--- a/src/systemc/ext/channel/sc_in.hh
+++ b/src/systemc/ext/channel/sc_in.hh
@@ -83,6 +83,7 @@ class sc_in : public sc_port<sc_signal_in_if<T>, 1>
         _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 13da38cd5..5de1bcafa 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 @@ class Printer : public sc_core::sc_module
         SC_THREAD(print);
     }
 
+    using sc_core::sc_object::print;
     void
     print()
     {
-- 
2.30.2