@@ -208,7 +208,7 @@ template <sc_core::sc_severity SEVERITY> using ScLogger = scc::ScLogger<SEVERITY
208208#define IIF_1 (t, ...) t
209209
210210#define CHECK_N (x, n, ...) n
211- #define CHECK (...) CHECK_N(__VA_ARGS__, 0 , )
211+ #define CHECK_ (...) CHECK_N(__VA_ARGS__, 0 , )
212212#define PROBE (x ) x, 1 ,
213213
214214#define EXPAND (...) __VA_ARGS__
@@ -219,7 +219,7 @@ template <sc_core::sc_severity SEVERITY> using ScLogger = scc::ScLogger<SEVERITY
219219#define STR_HELPER (x ) #x
220220#define STR (x ) STR_HELPER(x)
221221
222- #define IS_PAREN (x ) CHECK (IS_PAREN_PROBE x)
222+ #define IS_PAREN (x ) CHECK_ (IS_PAREN_PROBE x)
223223#define IS_PAREN_PROBE (...) PROBE(~)
224224/* *******/
225225
@@ -266,13 +266,13 @@ class call_sc_name_fn {
266266#define SCP_VBSTY_CHECK_UNCACHED (lvl, ...) (::scp::get_log_verbosity(__VA_ARGS__) >= lvl)
267267
268268#define SCP_VBSTY_CHECK (lvl, ...) \
269- IIF (IS_PAREN(FIRST_ARG(__VA_ARGS__))) \
270- ( SCP_VBSTY_CHECK_CACHED(lvl, FIRST_ARG(__VA_ARGS__), SCP_LOGGER_NAME(EXPAND(FIRST_ARG FIRST_ARG (__VA_ARGS__)))), \
271- SCP_VBSTY_CHECK_UNCACHED(lvl, ##__VA_ARGS__))
269+ IIF (IS_PAREN(FIRST_ARG(__VA_ARGS__)))( \
270+ SCP_VBSTY_CHECK_CACHED (lvl, FIRST_ARG(__VA_ARGS__), SCP_LOGGER_NAME(EXPAND(FIRST_ARG FIRST_ARG (__VA_ARGS__)))), \
271+ SCP_VBSTY_CHECK_UNCACHED(lvl, ##__VA_ARGS__))
272272
273273#define SCP_GET_FEATURES (...) \
274- IIF (IS_PAREN(FIRST_ARG(__VA_ARGS__))) \
275- ( FIRST_ARG EXPAND ((POP_ARG(__VA_ARGS__, SCP_LOGGER_NAME(EXPAND(FIRST_ARG FIRST_ARG (__VA_ARGS__))).type))), __VA_ARGS__)
274+ IIF (IS_PAREN(FIRST_ARG(__VA_ARGS__)))( \
275+ FIRST_ARG EXPAND ((POP_ARG(__VA_ARGS__, SCP_LOGGER_NAME(EXPAND(FIRST_ARG FIRST_ARG (__VA_ARGS__))).type))), __VA_ARGS__)
276276
277277#ifdef FMT_SHARED
278278#define _SCP_FMT_EMPTY_STR (...) fmt::format(__VA_ARGS__)
0 commit comments