generic-library/g3log
1
0
Fork 0
mirror of https://github.com/KjellKod/g3log.git synced 2024-12-12 18:30:25 +01:00
Code Issues Projects Releases Wiki Activity

Merge branch 'master' of github.com:KjellKod/g3log into mobileben_g3-shared-lib-typo

Browse Source
This commit is contained in:
Kjell Hedstrom 2017-05-17 14:05:58 -06:00
commit bd3da1eab9
4 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/g3log/g3log.hpp
View File

@ -24,6 +24,7 @@
#include "g3log/loglevels.hpp"
#include "g3log/logcapture.hpp"
#include "g3log/logmessage.hpp"
#include "g3log/generated_definitions.hpp"
#include <string>
#include <functional>
@ -128,7 +129,7 @@ namespace g3 {
} // internal
} // g3
#define INTERNAL_LOG_MESSAGE(level) LogCapture(__FILE__, __LINE__, __PRETTY_FUNCTION__, level)
#define INTERNAL_LOG_MESSAGE(level) LogCapture(__FILE__, __LINE__, static_cast<const char*>(__PRETTY_FUNCTION__), level)
#define INTERNAL_CONTRACT_MESSAGE(boolean_expression) \
LogCapture(__FILE__, __LINE__, __PRETTY_FUNCTION__, g3::internal::CONTRACT, boolean_expression)

2
test_unit/test_concept_sink.cpp
View File

@ -21,7 +21,7 @@
#include "g3log/sinkwrapper.hpp"
#include "g3log/sinkhandle.hpp"
#include "g3log/logmessage.hpp"
#include "g3log/generated_definitions.hpp"
using namespace std;
using namespace std2;

1
test_unit/test_io.cpp
View File

@ -11,6 +11,7 @@
#include "g3log/logworker.hpp"
#include "testing_helpers.h"
#include "g3log/loglevels.hpp"
#include "g3log/generated_definitions.hpp"
#include <memory>
#include <string>

2
test_unit/test_sink.cpp
View File

@ -15,7 +15,7 @@
#include <chrono>
#include <string>
#include <future>
#include <g3log/generated_definitions.hpp>
#include "testing_helpers.h"
#include "g3log/logmessage.hpp"
#include "g3log/logworker.hpp"