Skip to content

introducing LIBASSERT_WARNING_PRAGMA_PUSH_MSVC/LIBASSERT_WARNING_PRAGMA_POP_MSVC #135

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

Open
GerHobbelt wants to merge 1 commit into
base: dev
Choose a base branch
from
Open

introducing LIBASSERT_WARNING_PRAGMA_PUSH_MSVC/LIBASSERT_WARNING_PRAGMA_POP_MSVC #135

Show file tree
Hide file tree
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
5 changes: 5 additions & 0 deletions include/libassert/assert-catch2.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,9 @@ LIBASSERT_END_NAMESPACE

#define REQUIRE_ASSERT(expr) \
do { \
LIBASSERT_WARNING_PRAGMA_PUSH_CLANG \
LIBASSERT_WARNING_PRAGMA_PUSH_MSVC \
LIBASSERT_IGNORE_UNUSED_VALUE \
auto handler = ::libassert::get_failure_handler(); \
::libassert::set_failure_handler([] (const ::libassert::assertion_info& info) { \
throw info; \
Expand All @@ -60,6 +63,8 @@ LIBASSERT_END_NAMESPACE
FAIL("Expected assertion failure from " #expr " however none happened"); \
} \
::libassert::set_failure_handler(handler); \
LIBASSERT_WARNING_PRAGMA_POP_MSVC \
LIBASSERT_WARNING_PRAGMA_POP_CLANG \
} while(0)

#endif
22 changes: 22 additions & 0 deletions include/libassert/assert.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -596,6 +596,8 @@ LIBASSERT_END_NAMESPACE
#define LIBASSERT_WARNING_PRAGMA_POP_GCC _Pragma("GCC diagnostic pop")
#define LIBASSERT_WARNING_PRAGMA_PUSH_CLANG
#define LIBASSERT_WARNING_PRAGMA_POP_CLANG
#define LIBASSERT_WARNING_PRAGMA_PUSH_MSVC
#define LIBASSERT_WARNING_PRAGMA_POP_MSVC
#else
#define LIBASSERT_EXPRESSION_DECOMP_WARNING_PRAGMA_CLANG \
_Pragma("GCC diagnostic ignored \"-Wparentheses\"") \
Expand All @@ -605,12 +607,26 @@ LIBASSERT_END_NAMESPACE
#define LIBASSERT_WARNING_PRAGMA_POP_GCC
#define LIBASSERT_WARNING_PRAGMA_PUSH_CLANG _Pragma("GCC diagnostic push")
#define LIBASSERT_WARNING_PRAGMA_POP_CLANG _Pragma("GCC diagnostic pop")
#define LIBASSERT_WARNING_PRAGMA_PUSH_MSVC
#define LIBASSERT_WARNING_PRAGMA_POP_MSVC
#endif
#elif LIBASSERT_IS_MSVC
#define LIBASSERT_WARNING_PRAGMA_PUSH_CLANG
#define LIBASSERT_WARNING_PRAGMA_POP_CLANG
#define LIBASSERT_WARNING_PRAGMA_PUSH_GCC
#define LIBASSERT_WARNING_PRAGMA_POP_GCC
// https://learn.microsoft.com/en-us/cpp/preprocessor/pragma-directives-and-the-pragma-keyword?view=msvc-170
#define LIBASSERT_WARNING_PRAGMA_PUSH_MSVC _Pragma("warning(push)")
#define LIBASSERT_WARNING_PRAGMA_POP_MSVC _Pragma("warning(pop)")
#define LIBASSERT_EXPRESSION_DECOMP_WARNING_PRAGMA_GCC
#define LIBASSERT_EXPRESSION_DECOMP_WARNING_PRAGMA_CLANG
#else
#define LIBASSERT_WARNING_PRAGMA_PUSH_CLANG
#define LIBASSERT_WARNING_PRAGMA_POP_CLANG
#define LIBASSERT_WARNING_PRAGMA_PUSH_GCC
#define LIBASSERT_WARNING_PRAGMA_POP_GCC
#define LIBASSERT_WARNING_PRAGMA_PUSH_MSVC
#define LIBASSERT_WARNING_PRAGMA_POP_MSVC
#define LIBASSERT_EXPRESSION_DECOMP_WARNING_PRAGMA_GCC
#define LIBASSERT_EXPRESSION_DECOMP_WARNING_PRAGMA_CLANG
#endif
Expand Down Expand Up @@ -686,6 +702,8 @@ LIBASSERT_END_NAMESPACE
#define LIBASSERT_PRETTY_FUNCTION_ARG ,libassert::detail::pretty_function_name_wrapper{LIBASSERT_PFUNC}
#if LIBASSERT_IS_CLANG // -Wall in clang
#define LIBASSERT_IGNORE_UNUSED_VALUE _Pragma("GCC diagnostic ignored \"-Wunused-value\"")
#elif LIBASSERT_IS_MSVC
#define LIBASSERT_IGNORE_UNUSED_VALUE _Pragma("warning(disable: 4101)") // warning C4101: 'info': unreferenced local variable
#else
#define LIBASSERT_IGNORE_UNUSED_VALUE
#endif
Expand All @@ -708,6 +726,7 @@ LIBASSERT_END_NAMESPACE
/* must do awful stuff to workaround differences in where gcc and clang allow these directives to go */ \
do { \
LIBASSERT_WARNING_PRAGMA_PUSH_CLANG \
LIBASSERT_WARNING_PRAGMA_PUSH_MSVC \
LIBASSERT_IGNORE_UNUSED_VALUE \
LIBASSERT_EXPRESSION_DECOMP_WARNING_PRAGMA_CLANG \
LIBASSERT_WARNING_PRAGMA_PUSH_GCC \
Expand Down Expand Up @@ -736,6 +755,7 @@ LIBASSERT_END_NAMESPACE
); \
} \
} \
LIBASSERT_WARNING_PRAGMA_POP_MSVC \
LIBASSERT_WARNING_PRAGMA_POP_CLANG \
} while(0) \

Expand Down Expand Up @@ -786,6 +806,7 @@ LIBASSERT_END_NAMESPACE
/* must push/pop out here due to nasty clang bug https://github.com/llvm/llvm-project/issues/63897 */ \
/* must do awful stuff to workaround differences in where gcc and clang allow these directives to go */ \
LIBASSERT_WARNING_PRAGMA_PUSH_CLANG \
LIBASSERT_WARNING_PRAGMA_PUSH_MSVC \
LIBASSERT_IGNORE_UNUSED_VALUE \
LIBASSERT_EXPRESSION_DECOMP_WARNING_PRAGMA_CLANG \
LIBASSERT_STMTEXPR( \
Expand Down Expand Up @@ -834,6 +855,7 @@ LIBASSERT_END_NAMESPACE
std::is_lvalue_reference_v<decltype(libassert_value)> \
>(libassert_value, *std::launder(&libassert_decomposer)); \
) LIBASSERT_IF(doreturn)(.value,) \
LIBASSERT_WARNING_PRAGMA_POP_MSVC \
LIBASSERT_WARNING_PRAGMA_POP_CLANG

#ifdef NDEBUG
Expand Down