mirror of
https://github.com/KjellKod/g3log.git
synced 2025-03-30 15:45:58 +02:00
merging heads 1 of 2
This commit is contained in:
commit
97a6492d81
@ -43,7 +43,7 @@ namespace testing_helpers {
|
||||
|
||||
|
||||
void clearMockFatal() {
|
||||
g_mockFatal_message = {};
|
||||
g_mockFatal_message.clear();
|
||||
g_mockFatal_signal = -1;
|
||||
g_mockFatalWasCalled = false;
|
||||
}
|
||||
@ -122,6 +122,7 @@ namespace testing_helpers {
|
||||
|
||||
RestoreFileLogger::~RestoreFileLogger() {
|
||||
g2::internal::shutDownLogging();
|
||||
reset();
|
||||
|
||||
if (!removeFile(_log_file))
|
||||
ADD_FAILURE();
|
||||
|
Loading…
x
Reference in New Issue
Block a user