Fix multiple definition of show_c_string.

renatoGarcia · renatoGarcia · commit ae0c1d35401d · 2020-04-04T17:33:56.000-03:00
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -29,5 +29,5 @@ set(CMAKE_CXX_EXTENSIONS OFF)
 
 include_directories(${Boost_INCLUDE_DIRS})
 
-add_executable(test_exec test.cpp)
+add_executable(test_exec test.cpp test_2.cpp)
 add_test(NAME test COMMAND test_exec)
diff --git a/icecream.hpp b/icecream.hpp
@@ -55,8 +55,8 @@
 
 #define ICECREAM_MAJOR_VERSION 0
 #define ICECREAM_MINOR_VERSION 3
-#define ICECREAM_PATCH_VERSION 0
-#define ICECREAM_LIB_VERSION "0.3.0"
+#define ICECREAM_PATCH_VERSION 1
+#define ICECREAM_LIB_VERSION "0.3.1"
 
 
 #if defined(__GNUC__)
@@ -1294,7 +1294,7 @@ namespace icecream{ namespace detail
         }
     };
 
-    auto show_c_string() -> bool
+    inline auto show_c_string() -> bool
     {
         return Icecream::instance().show_c_string_;
     }
diff --git a/test_2.cpp b/test_2.cpp
@@ -0,0 +1,3 @@
+// Header used to catch multiple symbol definition
+
+#include "icecream.hpp"

Original file line number	Diff line number	Diff line change
`@@ -55,8 +55,8 @@`
`55`	`55`
`56`	`56`	`#define ICECREAM_MAJOR_VERSION 0`
`57`	`57`	`#define ICECREAM_MINOR_VERSION 3`
`58`		`-#define ICECREAM_PATCH_VERSION 0`
`59`		`-#define ICECREAM_LIB_VERSION "0.3.0"`
	`58`	`+#define ICECREAM_PATCH_VERSION 1`
	`59`	`+#define ICECREAM_LIB_VERSION "0.3.1"`
`60`	`60`
`61`	`61`
`62`	`62`	`#if defined(__GNUC__)`
`@@ -1294,7 +1294,7 @@ namespace icecream{ namespace detail`
`1294`	`1294`	`}`
`1295`	`1295`	`};`
`1296`	`1296`
`1297`		`- auto show_c_string() -> bool`
	`1297`	`+ inline auto show_c_string() -> bool`
`1298`	`1298`	`{`
`1299`	`1299`	`return Icecream::instance().show_c_string_;`
`1300`	`1300`	`}`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+// Header used to catch multiple symbol definition`
	`2`	`+`
	`3`	`+#include "icecream.hpp"`