drinkingtea/nostalgia
drinkingtea/nostalgia
2
0
Fork 0
Code Issues 6 Pull Requests Actions Releases 9 Activity

[ox/std] Fix assert for !OX_USE_STDLIB

Browse Source
This commit is contained in:
Gary Talent 2020-04-08 23:30:14 -05:00
parent 12c5339295
commit a4000f6497
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
deps/ox/src/ox/std/assert.cpp vendored
View File

@ -34,6 +34,7 @@ void assertFunc<bool>([[maybe_unused]]const char *file, [[maybe_unused]]int line
template<> template<>
void assertFunc<Error>(const char *file, int line, Error err, const char *assertMsg) { void assertFunc<Error>(const char *file, int line, Error err, const char *assertMsg) {
if (err) { if (err) {
#if defined(OX_USE_STDLIB)
std::cerr << "\033[31;1;1mASSERT FAILURE:\033[0m (" << file << ':' << line << "): " << assertMsg << '\n'; std::cerr << "\033[31;1;1mASSERT FAILURE:\033[0m (" << file << ':' << line << "): " << assertMsg << '\n';
if (err.msg) { if (err.msg) {
std::cerr << "\tError Message:\t" << err.msg << '\n'; std::cerr << "\tError Message:\t" << err.msg << '\n';
@ -45,6 +46,9 @@ void assertFunc<Error>(const char *file, int line, Error err, const char *assert
printStackTrace(2); printStackTrace(2);
oxTrace("panic").del("") << "Panic: " << assertMsg << " (" << file << ":" << line << ")"; oxTrace("panic").del("") << "Panic: " << assertMsg << " (" << file << ":" << line << ")";
std::abort(); std::abort();
#else
panic(file, line, assertMsg);
#endif
} }
} }