|
|
|
@ -80,9 +80,9 @@ template<typename... Args> std::string FormatStringFromLogArgs(const char *fmt,
@@ -80,9 +80,9 @@ template<typename... Args> std::string FormatStringFromLogArgs(const char *fmt,
|
|
|
|
|
std::string _log_msg_; /* Unlikely name to avoid shadowing variables */ \ |
|
|
|
|
try { \ |
|
|
|
|
_log_msg_ = tfm::format(__VA_ARGS__); \ |
|
|
|
|
} catch (tinyformat::format_error &e) { \ |
|
|
|
|
} catch (tinyformat::format_error &fmterr) { \ |
|
|
|
|
/* Original format string will have newline so don't add one here */ \ |
|
|
|
|
_log_msg_ = "Error \"" + std::string(e.what()) + "\" while formatting log message: " + FormatStringFromLogArgs(__VA_ARGS__); \ |
|
|
|
|
_log_msg_ = "Error \"" + std::string(fmterr.what()) + "\" while formatting log message: " + FormatStringFromLogArgs(__VA_ARGS__); \ |
|
|
|
|
} \ |
|
|
|
|
LogPrintStr(_log_msg_); \ |
|
|
|
|
} while(0) |
|
|
|
|