diff --git a/libs/utils/include/utils/Panic.h b/libs/utils/include/utils/Panic.h index a3415e10d5..872b99d4bf 100644 --- a/libs/utils/include/utils/Panic.h +++ b/libs/utils/include/utils/Panic.h @@ -582,19 +582,19 @@ public: #define PANIC_PRECONDITION_IMPL(cond, format, ...) \ ::utils::PreconditionPanic::panic(PANIC_FUNCTION, \ - PANIC_FILE(__FILE__), __LINE__, #cond, format, format, ##__VA_ARGS__) + PANIC_FILE(__FILE__), __LINE__, #cond, format, ##__VA_ARGS__) #define PANIC_POSTCONDITION_IMPL(cond, format, ...) \ ::utils::PostconditionPanic::panic(PANIC_FUNCTION, \ - PANIC_FILE(__FILE__), __LINE__, #cond, format, format, ##__VA_ARGS__) + PANIC_FILE(__FILE__), __LINE__, #cond, format, ##__VA_ARGS__) #define PANIC_ARITHMETIC_IMPL(cond, format, ...) \ ::utils::ArithmeticPanic::panic(PANIC_FUNCTION, \ - PANIC_FILE(__FILE__), __LINE__, #cond, format, format, ##__VA_ARGS__) + PANIC_FILE(__FILE__), __LINE__, #cond, format, ##__VA_ARGS__) #define PANIC_LOG_IMPL(cond, format, ...) \ ::utils::details::panicLog(PANIC_FUNCTION, \ - PANIC_FILE(__FILE__), __LINE__, #cond, format, format, ##__VA_ARGS__) + PANIC_FILE(__FILE__), __LINE__, format, ##__VA_ARGS__) /** * PANIC_PRECONDITION is a macro that reports a PreconditionPanic diff --git a/libs/utils/src/Panic.cpp b/libs/utils/src/Panic.cpp index d8577f4fd6..1b8921ac06 100644 --- a/libs/utils/src/Panic.cpp +++ b/libs/utils/src/Panic.cpp @@ -108,10 +108,10 @@ static std::string buildPanicString( std::string_view const& msg, const char* function, int line, const char* file, const char* reason) { #ifndef NDEBUG - return sprintfToString("=%.*s\nin %s:%d\nin file %s\nreason: %s", + return sprintfToString("%.*s\nin %s:%d\nin file %s\nreason: %s", msg.size(), msg.data(), function, line, file, reason); #else - return sprintfToString("=%.*s\nin %s:%d\nreason: %s", + return sprintfToString("%.*s\nin %s:%d\nreason: %s", msg.size(), msg.data(), function, line, reason); #endif } diff --git a/libs/utils/src/debug.cpp b/libs/utils/src/debug.cpp index 3d20475ad7..2a494d7130 100644 --- a/libs/utils/src/debug.cpp +++ b/libs/utils/src/debug.cpp @@ -31,7 +31,7 @@ void abort() noexcept { } void panic(const char *func, const char * file, int line, const char *assertion) noexcept { - PANIC_LOG("%s:%d: failed assertion `%s'\n", file, line, assertion); + PANIC_LOG("%s:%d: failed assertion '%s'\n", file, line, assertion); abort(); // set a breakpoint here return; // this line is needed to be able to move the cursor here in the debugger }