From: Earl Ou <shunhsingou@google.com>
Date: Thu, 2 Jan 2020 07:24:46 +0000 (+0800)
Subject: systemc: keep SC_CONCAT* macro
X-Git-Tag: v19.0.0.0~119
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=07688f1b4f3679544dde3aa0c426a538499e87d6;p=gem5.git

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 <gabeblack@google.com>
Maintainer: Gabe Black <gabeblack@google.com>
Tested-by: kokoro <noreply+kokoro@google.com>
---

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__ */