From 173f71dca619b1530c16199f926f980bde2811b6 Mon Sep 17 00:00:00 2001 From: Tymoteusz Blazejczyk Date: Sun, 17 Dec 2017 08:23:22 -0500 Subject: [PATCH] Fix SystemC 2.3.2 compile error, bug1251. Signed-off-by: Wilson Snyder --- Changes | 2 ++ include/verilated_vcd_sc.cpp | 5 +++++ include/verilated_vcd_sc.h | 5 +++++ 3 files changed, 12 insertions(+) diff --git a/Changes b/Changes index e1720f868..e2ebac43a 100644 --- a/Changes +++ b/Changes @@ -15,6 +15,8 @@ The contributors that suggested a given feature are shown in []. Thanks! **** Add error if always_comb has sensitivity list. [Arjen Roodselaar] +**** Fix SystemC 2.3.2 compile error, bug1251. [Tymoteusz Blazejczyk] + **** Fix modport outputs being treated as inputs, bug1246. [Jeff Bush] **** Fix false ALWCOMBORDER on interface references, bug1247. [Josh Redford] diff --git a/include/verilated_vcd_sc.cpp b/include/verilated_vcd_sc.cpp index f6b4bc62c..2cd40ca28 100644 --- a/include/verilated_vcd_sc.cpp +++ b/include/verilated_vcd_sc.cpp @@ -39,6 +39,11 @@ void VerilatedVcdSc::trace (const unsigned int &, const std::string &, const cha # define DECL_TRACE_METHOD_B(tp) \ void VerilatedVcdSc::trace( const tp& object, const std::string& name, int width ) {} +#if (SYSTEMC_VERSION>=20171012) + DECL_TRACE_METHOD_A( sc_event ) + DECL_TRACE_METHOD_A( sc_time ) +#endif + DECL_TRACE_METHOD_A( bool ) DECL_TRACE_METHOD_A( sc_dt::sc_bit ) DECL_TRACE_METHOD_A( sc_dt::sc_logic ) diff --git a/include/verilated_vcd_sc.h b/include/verilated_vcd_sc.h index 065ded755..8a57b3638 100644 --- a/include/verilated_vcd_sc.h +++ b/include/verilated_vcd_sc.h @@ -96,6 +96,11 @@ private: virtual void write_comment (const std::string &); virtual void trace (const unsigned int &, const std::string &, const char **); +#if (SYSTEMC_VERSION>=20171012) + DECL_TRACE_METHOD_A( sc_event ) + DECL_TRACE_METHOD_A( sc_time ) +#endif + DECL_TRACE_METHOD_A( bool ) DECL_TRACE_METHOD_A( sc_dt::sc_bit ) DECL_TRACE_METHOD_A( sc_dt::sc_logic )