Merge pull request #208 from fmtlib/master

fix module test odr violations (fmtlib#2414)
sthagen · Jul 17, 2021 · 50b2868 · 50b2868
2 parents 2287fff + 00235d8
commit 50b2868
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 0 deletions.
diff --git a/test/gtest-extra.h b/test/gtest-extra.h
@@ -12,7 +12,12 @@
 
 #include <string>
 
+#ifdef FMT_MODULE_TEST
+import fmt;
+#else
 #include "fmt/os.h"
+#endif // FMG_MODULE_TEST
+
 #include "gmock/gmock.h"
 
 #define FMT_TEST_THROW_(statement, expected_exception, expected_message, fail) \

diff --git a/test/module-test.cc b/test/module-test.cc
@@ -15,6 +15,8 @@
 #  define FMT_HIDE_MODULE_BUGS
 #endif
 
+#define FMT_MODULE_TEST
+
 #include <bit>
 #include <chrono>
 #include <exception>

diff --git a/test/util.h b/test/util.h
@@ -10,7 +10,11 @@
 #include <locale>
 #include <string>
 
+#ifdef FMT_MODULE_TEST
+import fmt;
+#else
 #include "fmt/os.h"
+#endif // FMT_MODULE_TEST
 
 #ifdef _MSC_VER
 #  define FMT_VSNPRINTF vsprintf_s