From 24dea1ceea118d14b7b493d176e79c5b87088a39 Mon Sep 17 00:00:00 2001 From: Jakob Wanner Date: Wed, 17 May 2017 16:07:39 +0200 Subject: [PATCH 1/3] Cast char array to pointer to char in INTERNAL_LOG_MESSAGE (#193) --- src/g3log/g3log.hpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/g3log/g3log.hpp b/src/g3log/g3log.hpp index 6d2ec16..eec8f3a 100644 --- a/src/g3log/g3log.hpp +++ b/src/g3log/g3log.hpp @@ -128,7 +128,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(__PRETTY_FUNCTION__), level) #define INTERNAL_CONTRACT_MESSAGE(boolean_expression) \ LogCapture(__FILE__, __LINE__, __PRETTY_FUNCTION__, g3::internal::CONTRACT, boolean_expression) From c08fba999b7a5fb8875e76410534b18862f09f42 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kjell=20Hedstr=C3=B6m?= Date: Wed, 17 May 2017 08:25:29 -0600 Subject: [PATCH 2/3] Definitions made explicit (#196) * force definition inclusion * to make it clear to the user --- src/g3log/g3log.hpp | 1 + test_unit/test_concept_sink.cpp | 2 +- test_unit/test_io.cpp | 1 + test_unit/test_sink.cpp | 2 +- 4 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/g3log/g3log.hpp b/src/g3log/g3log.hpp index eec8f3a..c5f4d19 100644 --- a/src/g3log/g3log.hpp +++ b/src/g3log/g3log.hpp @@ -24,6 +24,7 @@ #include "g3log/loglevels.hpp" #include "g3log/logcapture.hpp" #include "g3log/logmessage.hpp" +#include "g3log/generated_definitions.hpp" #include #include diff --git a/test_unit/test_concept_sink.cpp b/test_unit/test_concept_sink.cpp index 8f51770..914a9e9 100644 --- a/test_unit/test_concept_sink.cpp +++ b/test_unit/test_concept_sink.cpp @@ -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; diff --git a/test_unit/test_io.cpp b/test_unit/test_io.cpp index b19ad9d..9dd592a 100644 --- a/test_unit/test_io.cpp +++ b/test_unit/test_io.cpp @@ -11,6 +11,7 @@ #include "g3log/logworker.hpp" #include "testing_helpers.h" #include "g3log/loglevels.hpp" +#include "g3log/generated_definitions.hpp" #include #include diff --git a/test_unit/test_sink.cpp b/test_unit/test_sink.cpp index 1905270..28a79eb 100644 --- a/test_unit/test_sink.cpp +++ b/test_unit/test_sink.cpp @@ -15,7 +15,7 @@ #include #include #include - +#include #include "testing_helpers.h" #include "g3log/logmessage.hpp" #include "g3log/logworker.hpp" From 769feca4d03aff665447de5a27999192e5a9bd86 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kjell=20Hedstr=C3=B6m?= Date: Wed, 17 May 2017 08:32:10 -0600 Subject: [PATCH 3/3] Corrected cmake log message (#197) --- Options.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Options.cmake b/Options.cmake index ea3740a..a9dbbd5 100644 --- a/Options.cmake +++ b/Options.cmake @@ -75,7 +75,7 @@ option (G3_SHARED_LIB "Build shared library" ON) IF(G3_SHARED_LIB) MESSAGE("-DG3_SHARED_LIB=ON\tBuild shared library") ELSE() - MESSAGE("-DG3_SHARED_LIB=ON\tBuild static library") + MESSAGE("-DG3_SHARED_LIB=OFF\tBuild static library") ENDIF() # WINDOWS OPTIONS