From: Gabe Black <gabeblack@google.com>
Date: Tue, 3 Dec 2019 14:05:08 +0000 (-0800)
Subject: systemc: Purposefully *expose* bind in the initiator socket.
X-Git-Tag: v19.0.0.0~234
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=ef481775ae58afad37abe0c3c9b9bdf119d7bf33;p=gem5.git

systemc: Purposefully *expose* bind in the initiator socket.

Apparently the base version of bind actually *is* supposed to be
accessible, so expose it with using instead of hiding it.

Change-Id: Ie762c35d6322e744696ed597189b7773ea68c3b7
Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/23322
Reviewed-by: Gabe Black <gabeblack@google.com>
Maintainer: Gabe Black <gabeblack@google.com>
Tested-by: kokoro <noreply+kokoro@google.com>
---

diff --git a/src/systemc/ext/tlm_core/2/sockets/initiator_socket.hh b/src/systemc/ext/tlm_core/2/sockets/initiator_socket.hh
index 75f8f0ab3..35c650bce 100644
--- a/src/systemc/ext/tlm_core/2/sockets/initiator_socket.hh
+++ b/src/systemc/ext/tlm_core/2/sockets/initiator_socket.hh
@@ -120,6 +120,8 @@ class tlm_base_initiator_socket :
         (s.get_base_export())(get_base_export());
     }
 
+    using port_type::bind;
+
     void operator() (base_type &s) { bind(s); }
 
     //
@@ -169,9 +171,6 @@ class tlm_base_initiator_socket :
 
   protected:
     export_type m_export;
-
-  private:
-    using port_type::bind;
 };
 
 //