Skip to content

🐛 Fix macro semicolon handling #754

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Aug 9, 2025
Merged

🐛 Fix macro semicolon handling #754

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 6 additions & 12 deletions include/log/env.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,6 @@ using cib_log_env_t = stdx::env<>;

// NOLINTBEGIN(cppcoreguidelines-macro-usage)

#ifdef __clang__
#define CIB_PRAGMA_SEMI
#else
#define CIB_PRAGMA_SEMI ;
#endif

#define CIB_LOG_ENV_DECL(...) \
[[maybe_unused]] typedef decltype([] { \
return stdx::extend_env_t<cib_log_env_t, __VA_ARGS__>{}; \
Expand All @@ -26,16 +20,16 @@ using cib_log_env_t = stdx::env<>;
#define CIB_LOG_ENV(...) \
STDX_PRAGMA(diagnostic push) \
STDX_PRAGMA(diagnostic ignored "-Wshadow") \
CIB_LOG_ENV_DECL(__VA_ARGS__) \
CIB_PRAGMA_SEMI \
STDX_PRAGMA(diagnostic pop)
CIB_LOG_ENV_DECL(__VA_ARGS__); \
STDX_PRAGMA(diagnostic pop) \
static_assert(true)

#define CIB_APPEND_LOG_ENV(E) \
STDX_PRAGMA(diagnostic push) \
STDX_PRAGMA(diagnostic ignored "-Wshadow") \
CIB_APPEND_LOG_ENV_DECL(E) \
CIB_PRAGMA_SEMI \
STDX_PRAGMA(diagnostic pop)
CIB_APPEND_LOG_ENV_DECL(E); \
STDX_PRAGMA(diagnostic pop) \
static_assert(true)

#define CIB_WITH_LOG_ENV(...) \
STDX_PRAGMA(diagnostic push) \
Expand Down
Loading