From: Gabe Black <gabeblack@google.com>
Date: Wed, 27 Nov 2019 12:14:06 +0000 (-0800)
Subject: systemc: Fix up some lingering Accellera specific code in TLM v1.
X-Git-Tag: v19.0.0.0~240
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=5daf5ea2b66e3e4331b9953623f96e98d86268b4;p=gem5.git

systemc: Fix up some lingering Accellera specific code in TLM v1.

This was missed initially, but clang complained about it.

Change-Id: Ie6d240447a74f96faf9da87bd2f1134c1d82be8e
Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/23128
Tested-by: kokoro <noreply+kokoro@google.com>
Reviewed-by: Giacomo Travaglini <giacomo.travaglini@arm.com>
Maintainer: Gabe Black <gabeblack@google.com>
---

diff --git a/src/systemc/ext/tlm_core/1/req_rsp/ports/event_finder.hh b/src/systemc/ext/tlm_core/1/req_rsp/ports/event_finder.hh
index 49e5ed08a..350e23c22 100644
--- a/src/systemc/ext/tlm_core/1/req_rsp/ports/event_finder.hh
+++ b/src/systemc/ext/tlm_core/1/req_rsp/ports/event_finder.hh
@@ -28,13 +28,13 @@ namespace tlm
 {
 
 template <class IF, class T>
-class tlm_event_finder_t : public sc_core::sc_event_finder
+class tlm_event_finder_t : public sc_core::sc_event_finder_t<IF>
 {
   public:
     tlm_event_finder_t(const sc_core::sc_port_base &port_,
                        const sc_core::sc_event &(IF::*event_method_)(
                            tlm_tag<T> *) const) :
-        sc_core::sc_event_finder(port_), m_event_method(event_method_)
+        sc_core::sc_event_finder_t<IF>(port_), m_event_method(event_method_)
     {}
 
     virtual ~tlm_event_finder_t() {}
@@ -57,11 +57,11 @@ inline const sc_core::sc_event &
 tlm_event_finder_t<IF, T>::find_event(sc_core::sc_interface *if_p) const
 {
     const IF *iface = if_p ? dynamic_cast<const IF *>(if_p) :
-        dynamic_cast<const IF *>(port()->_gem5Interface(0));
+        dynamic_cast<const IF *>(this->port()->_gem5Interface(0));
     if (iface == nullptr) {
         std::ostringstream out;
-        out << "port is not bound: port '" << port()->name() <<
-            "' (" << port()->kind() << ")";
+        out << "port is not bound: port '" << this->port()->name() <<
+            "' (" << this->port()->kind() << ")";
         SC_REPORT_ERROR(sc_core::SC_ID_FIND_EVENT_, out.str().c_str());
         static sc_core::sc_event none;
         return none;