From 07688f1b4f3679544dde3aa0c426a538499e87d6 Mon Sep 17 00:00:00 2001 From: Earl Ou Date: Thu, 2 Jan 2020 15:24:46 +0800 Subject: [PATCH] systemc: keep SC_CONCAT* macro 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 Maintainer: Gabe Black Tested-by: kokoro --- src/systemc/ext/tlm_core/2/generic_payload/phase.hh | 8 -------- 1 file changed, 8 deletions(-) diff --git a/src/systemc/ext/tlm_core/2/generic_payload/phase.hh b/src/systemc/ext/tlm_core/2/generic_payload/phase.hh index db5866a6b..df61ffa68 100644 --- a/src/systemc/ext/tlm_core/2/generic_payload/phase.hh +++ b/src/systemc/ext/tlm_core/2/generic_payload/phase.hh @@ -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__ */ -- 2.30.2