"Merge Tagged PR 7497"

This commit is contained in:
yuzubot committed 2022-03-18 12:03:08 +00:00
1 parent 25fab5be48
commit 223ff496a3
3 files changed
+8 -7

No files matched your search

+3 -2
View File
@@ -37,7 +37,8 @@ if (MSVC)
add_compile_options(
/MP
/Zi
/Zm200
/Zm300
/Zf
/Zo
/permissive-
/EHsc
@@ -81,7 +82,7 @@ if (MSVC)
add_compile_options("$<$<CONFIG:Release>:/GS->")
set(CMAKE_EXE_LINKER_FLAGS_DEBUG "/DEBUG /MANIFEST:NO" CACHE STRING "" FORCE)
set(CMAKE_EXE_LINKER_FLAGS_RELEASE "/DEBUG /MANIFEST:NO /INCREMENTAL:NO /OPT:REF,ICF" CACHE STRING "" FORCE)
set(CMAKE_EXE_LINKER_FLAGS_RELEASE "${CMAKE_EXE_LINKER_FLAGS_RELEASE} /DEBUG /MANIFEST:NO /INCREMENTAL:NO /OPT:REF,ICF" CACHE STRING "" FORCE)
else()
add_compile_options(
-Wall
+4 -4
View File
@@ -32,14 +32,14 @@ assert_noinline_call(const Fn& fn) {
#define ASSERT(_a_) \
do \
if (!(_a_)) { \
if (!(_a_)) [[unlikely]] { \
assert_noinline_call([] { LOG_CRITICAL(Debug, "Assertion Failed!"); }); \
} \
while (0)
#define ASSERT_MSG(_a_, ...) \
do \
if (!(_a_)) { \
if (!(_a_)) [[unlikely]] { \
assert_noinline_call([&] { LOG_CRITICAL(Debug, "Assertion Failed!\n" __VA_ARGS__); }); \
} \
while (0)
@@ -70,7 +70,7 @@ assert_noinline_call(const Fn& fn) {
#define ASSERT_OR_EXECUTE(_a_, _b_) \
do { \
ASSERT(_a_); \
if (!(_a_)) { \
if (!(_a_)) [[unlikely]] { \
_b_ \
} \
} while (0)
@@ -79,7 +79,7 @@ assert_noinline_call(const Fn& fn) {
#define ASSERT_OR_EXECUTE_MSG(_a_, _b_, ...) \
do { \
ASSERT_MSG(_a_, __VA_ARGS__); \
if (!(_a_)) { \
if (!(_a_)) [[unlikely]] { \
_b_ \
} \
} while (0)