hardcoresushi/libcryfs
1
0
Fork 0
Code Issues Pull Requests Releases Activity

Allow std::string ASSERT messages

Browse Source
This commit is contained in:
Sebastian Messmer 2015-11-10 19:40:34 -08:00
parent e15796f738
commit 9c86b619a6
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
assert/assert.h
View File

@ -15,19 +15,19 @@
namespace cpputils { namespace cpputils {
namespace _assert { namespace _assert {
inline std::string format(const char *expr, const char *message, const char *file, int line) { inline std::string format(const char *expr, const std::string &message, const char *file, int line) {
std::string result = std::string()+"Assertion ["+expr+"] failed in "+file+":"+std::to_string(line)+": "+message+"\n\n" + backtrace(); std::string result = std::string()+"Assertion ["+expr+"] failed in "+file+":"+std::to_string(line)+": "+message+"\n\n" + backtrace();
return result; return result;
} }
inline void assert_fail_release [[noreturn]] (const char *expr, const char *message, const char *file, int line) { inline void assert_fail_release [[noreturn]] (const char *expr, const std::string &message, const char *file, int line) {
auto msg = format(expr, message, file, line); auto msg = format(expr, message, file, line);
using namespace logging; using namespace logging;
LOG(ERROR) << msg; LOG(ERROR) << msg;
throw AssertFailed(msg); throw AssertFailed(msg);
} }
inline void assert_fail_debug [[noreturn]] (const char *expr, const char *message, const char *file, int line) { inline void assert_fail_debug [[noreturn]] (const char *expr, const std::string &message, const char *file, int line) {
using namespace logging; using namespace logging;
LOG(ERROR) << format(expr, message, file, line); LOG(ERROR) << format(expr, message, file, line);
abort(); abort();