systemc: keep SC_CONCAT* macro
authorEarl Ou <shunhsingou@google.com>
Thu, 2 Jan 2020 07:24:46 +0000 (15:24 +0800)
committerEarl Ou <shunhsingou@google.com>
Mon, 13 Jan 2020 01:42:58 +0000 (01:42 +0000)
Call of TLM_DECLARE_EXTENDED_PHASE requires SC_CONCAT* macros.  This change
keeps those macros to avoid compile errors.

Change-Id: I573c4c126a350ef1a752d1c50658e7d9cedaaeae
Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/24123
Reviewed-by: Gabe Black <gabeblack@google.com>
Maintainer: Gabe Black <gabeblack@google.com>
Tested-by: kokoro <noreply+kokoro@google.com>
src/systemc/ext/tlm_core/2/generic_payload/phase.hh

index db5866a6b88edb33e4948beab86abb339bc0217b..df61ffa68a164dc19c8782fe1d815024f7290aa0 100644 (file)
@@ -106,12 +106,4 @@ static class SC_CONCAT_HELPER_(tlm_phase_, name_arg) : \
 
 } // namespace tlm
 
-#undef SC_CONCAT_HELPER_
-#undef SC_CONCAT_HELPER_DEFERRED_
-#undef SC_CONCAT_HELPER_MORE_DEFERRED_
-
-#undef SC_STRINGIFY_HELPER_
-#undef SC_STRINGIFY_HELPER_DEFERRED_
-#undef SC_STRINGIFY_HELPER_MORE_DEFERRED_
-
 #endif /* __SYSTEMC_EXT_TLM_CORE_2_GENERIC_PAYLOAD_PHASE_HH__ */