Skip to content

Move ASSERT handler into GPGMM namespace. #367

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
Jun 1, 2022
Merged

Move ASSERT handler into GPGMM namespace. #367

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
22 changes: 13 additions & 9 deletions src/gpgmm/utils/Assert.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,15 +18,19 @@

#include <cstdlib>

void HandleAssertionFailure(const char* file,
const char* function,
int line,
const char* condition) {
gpgmm::ErrorLog() << "Assertion failure at " << file << ":" << line << " (" << function
<< "): " << condition;
namespace gpgmm {

void HandleAssertionFailure(const char* file,
const char* function,
int line,
const char* condition) {
gpgmm::ErrorLog() << "Assertion failure at " << file << ":" << line << " (" << function
<< "): " << condition;
#if defined(GPGMM_ABORT_ON_ASSERT)
abort();
abort();
#else
GPGMM_BREAKPOINT();
GPGMM_BREAKPOINT();
#endif
}
}

} // namespace gpgmm
22 changes: 13 additions & 9 deletions src/gpgmm/utils/Assert.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,11 +40,11 @@
// expect of an assert and in release it tries to give hints to make the compiler generate better
// code.
#if defined(GPGMM_ENABLE_ASSERTS)
# define GPGMM_ASSERT_CALLSITE_HELPER(file, func, line, condition) \
do { \
if (!(condition)) { \
HandleAssertionFailure(file, func, line, #condition); \
} \
# define GPGMM_ASSERT_CALLSITE_HELPER(file, func, line, condition) \
do { \
if (!(condition)) { \
gpgmm::HandleAssertionFailure(file, func, line, #condition); \
} \
} while (GPGMM_ASSERT_LOOP_CONDITION)
#else
# if defined(GPGMM_COMPILER_MSVC)
Expand Down Expand Up @@ -78,9 +78,13 @@
# define UNREACHABLE GPGMM_UNREACHABLE
#endif

void HandleAssertionFailure(const char* file,
const char* function,
int line,
const char* condition);
namespace gpgmm {

void HandleAssertionFailure(const char* file,
const char* function,
int line,
const char* condition);

}

#endif // GPGMM_UTILS_ASSERT_H_