From 5701aab0f17aec5d2f857fa00a75b8f5db617ec1 Mon Sep 17 00:00:00 2001 From: Gabe Black Date: Wed, 2 Jan 2019 22:14:23 -0800 Subject: systemc: Stop using the Accellera specific "none" global event object. That event being available is nonstandard. Define our own static event for use in that case. Change-Id: I5e8892bd83cc1984d63949ef3e249755dca0c702 Reviewed-on: https://gem5-review.googlesource.com/c/15296 Reviewed-by: Anthony Gutierrez Maintainer: Anthony Gutierrez --- src/systemc/ext/tlm_core/1/req_rsp/ports/event_finder.hh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'src') 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 2e411ebad..cdf2d8b58 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 @@ -56,9 +56,10 @@ 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)); + static sc_core::sc_event none; if (iface == nullptr) { report_error(sc_core::SC_ID_FIND_EVENT_, "port is not bound"); - return sc_core::sc_event::none; + return none; } return (const_cast(iface)->*m_event_method)(nullptr); } -- cgit v1.2.3