[gem5-dev] Change in gem5/gem5[master]: systemc: Fix up some lingering Accellera specific code in TLM v1.

2019-12-03 Thread Gabe Black (Gerrit)
Gabe Black has submitted this change. (  
https://gem5-review.googlesource.com/c/public/gem5/+/23128 )


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

..

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 
Reviewed-by: Giacomo Travaglini 
Maintainer: Gabe Black 
---
M src/systemc/ext/tlm_core/1/req_rsp/ports/event_finder.hh
1 file changed, 5 insertions(+), 5 deletions(-)

Approvals:
  Giacomo Travaglini: Looks good to me, approved
  Gabe Black: Looks good to me, approved
  kokoro: Regressions pass



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 49e5ed0..350e23c 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 @@
 {

 template 
-class tlm_event_finder_t : public sc_core::sc_event_finder
+class tlm_event_finder_t : public sc_core::sc_event_finder_t
 {
   public:
 tlm_event_finder_t(const sc_core::sc_port_base _,
const sc_core::sc_event &(IF::*event_method_)(
tlm_tag *) const) :
-sc_core::sc_event_finder(port_), m_event_method(event_method_)
+sc_core::sc_event_finder_t(port_),  
m_event_method(event_method_)

 {}

 virtual ~tlm_event_finder_t() {}
@@ -57,11 +57,11 @@
 tlm_event_finder_t::find_event(sc_core::sc_interface *if_p) const
 {
 const IF *iface = if_p ? dynamic_cast(if_p) :
-dynamic_cast(port()->_gem5Interface(0));
+dynamic_cast(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;

--
To view, visit https://gem5-review.googlesource.com/c/public/gem5/+/23128
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: Ie6d240447a74f96faf9da87bd2f1134c1d82be8e
Gerrit-Change-Number: 23128
Gerrit-PatchSet: 4
Gerrit-Owner: Gabe Black 
Gerrit-Reviewer: Gabe Black 
Gerrit-Reviewer: Giacomo Travaglini 
Gerrit-Reviewer: Jason Lowe-Power 
Gerrit-Reviewer: kokoro 
Gerrit-MessageType: merged
___
gem5-dev mailing list
gem5-dev@gem5.org
http://m5sim.org/mailman/listinfo/gem5-dev

[gem5-dev] Change in gem5/gem5[master]: systemc: Fix up some lingering Accellera specific code in TLM v1.

2019-11-27 Thread Gabe Black (Gerrit)
Gabe Black has uploaded this change for review. (  
https://gem5-review.googlesource.com/c/public/gem5/+/23128 )



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

..

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

This was missed initially, but clang complained about it.

Change-Id: Ie6d240447a74f96faf9da87bd2f1134c1d82be8e
---
M src/systemc/ext/tlm_core/1/req_rsp/ports/event_finder.hh
1 file changed, 5 insertions(+), 5 deletions(-)



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 49e5ed0..350e23c 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 @@
 {

 template 
-class tlm_event_finder_t : public sc_core::sc_event_finder
+class tlm_event_finder_t : public sc_core::sc_event_finder_t
 {
   public:
 tlm_event_finder_t(const sc_core::sc_port_base _,
const sc_core::sc_event &(IF::*event_method_)(
tlm_tag *) const) :
-sc_core::sc_event_finder(port_), m_event_method(event_method_)
+sc_core::sc_event_finder_t(port_),  
m_event_method(event_method_)

 {}

 virtual ~tlm_event_finder_t() {}
@@ -57,11 +57,11 @@
 tlm_event_finder_t::find_event(sc_core::sc_interface *if_p) const
 {
 const IF *iface = if_p ? dynamic_cast(if_p) :
-dynamic_cast(port()->_gem5Interface(0));
+dynamic_cast(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;

--
To view, visit https://gem5-review.googlesource.com/c/public/gem5/+/23128
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: Ie6d240447a74f96faf9da87bd2f1134c1d82be8e
Gerrit-Change-Number: 23128
Gerrit-PatchSet: 1
Gerrit-Owner: Gabe Black 
Gerrit-MessageType: newchange
___
gem5-dev mailing list
gem5-dev@gem5.org
http://m5sim.org/mailman/listinfo/gem5-dev