generic-library/g3log
1
0
Fork 0
mirror of https://github.com/KjellKod/g3log.git synced 2025-01-31 14:39:54 +01:00
Code Issues Projects Releases Wiki Activity

merging heads

Browse Source 
--HG--
branch : merge
This commit is contained in:
KjellKod 2013-12-10 10:36:21 -07:00
commit 7de3c5fe78
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
g2log/src/g2log.cpp
View File

@ -132,7 +132,7 @@ namespace g2 {
error << "FATAL CALL but logger is NOT initialized\n" error << "FATAL CALL but logger is NOT initialized\n"
<< "SIGNAL: " << message.get()->signal() << "SIGNAL: " << message.get()->signal()
<< "\nMessage: \n" << message.get()->toString() << std::flush; << "\nMessage: \n" << message.get()->toString() << std::flush;
std::cerr << error << std::flush; std::cerr << error.str() << std::flush;
internal::exitWithDefaultSignalHandler(message.get()->_signal_id); internal::exitWithDefaultSignalHandler(message.get()->_signal_id);
} }

4
g2log/test_unit/testing_helpers.cpp
View File

@ -13,7 +13,7 @@ using namespace g2;
namespace testing_helpers { namespace testing_helpers {
std::string g_mockFatal_message = {}; std::string g_mockFatal_message{};
int g_mockFatal_signal = -1; int g_mockFatal_signal = -1;
bool g_mockFatalWasCalled = false; bool g_mockFatalWasCalled = false;
@ -43,7 +43,7 @@ namespace testing_helpers {
void clearMockFatal() { void clearMockFatal() {
g_mockFatal_message = {}; g_mockFatal_message.clear();
g_mockFatal_signal = -1; g_mockFatal_signal = -1;
g_mockFatalWasCalled = false; g_mockFatalWasCalled = false;
} }