Instruct msvc to report the _true_ value in __cplusplus and force _…

…full_ C++ conformance * do this in _some_ tests to improve test coverage and catch possible problems due to that * fix invalid export of `static constexpr` constant * silence msvc warnings about unreachable code in high warning levels
fmtlib · Jun 13, 2021 · f73b909 · f73b909
1 parent f28cf33
commit f73b909
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 3 deletions.
diff --git a/include/fmt/core.h b/include/fmt/core.h
@@ -238,6 +238,7 @@
 
 #ifndef FMT_MODULE_EXPORT
 #  define FMT_MODULE_EXPORT
+#  define FMT_MODULE_EXPORT_CONSTANT static
 #  define FMT_MODULE_EXPORT_BEGIN
 #  define FMT_MODULE_EXPORT_END
 #  define FMT_BEGIN_DETAIL_NAMESPACE namespace detail {

diff --git a/include/fmt/os.h b/include/fmt/os.h
@@ -394,7 +394,7 @@ struct ostream_params {
 
 FMT_END_DETAIL_NAMESPACE
 
-static constexpr detail::buffer_size buffer_size;
+FMT_MODULE_EXPORT_CONSTANT constexpr detail::buffer_size buffer_size;
 
 /** A fast output stream which is not thread-safe. */
 class FMT_API ostream final : private detail::buffer<char> {

diff --git a/src/fmt.cc b/src/fmt.cc
@@ -2,6 +2,9 @@ module;
 #ifndef __cpp_modules
 #  error Module not supported.
 #endif
+#ifdef _MSC_VER
+#  pragma warning(disable : 4702)
+#endif
 
 // put all implementation-provided headers into the global module fragment
 // to prevent attachment to this module
@@ -71,6 +74,7 @@ module;
 export module fmt;
 
 #define FMT_MODULE_EXPORT export
+#define FMT_MODULE_EXPORT_CONSTANT
 #define FMT_MODULE_EXPORT_BEGIN export {
 #define FMT_MODULE_EXPORT_END }
 #define FMT_BEGIN_DETAIL_NAMESPACE \

diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
@@ -99,8 +99,10 @@ if (FMT_CAN_MODULE)
 
   add_fmt_test(module-test MODULE)
   if (MSVC)
-    target_compile_options(test-module PRIVATE /utf-8)
-    target_compile_options(module-test PRIVATE /utf-8)
+    target_compile_options(test-module PRIVATE /utf-8 /Zc:__cplusplus
+                           /Zc:externConstexpr /Zc:inline)
+    target_compile_options(module-test PRIVATE /utf-8 /Zc:__cplusplus
+                           /Zc:externConstexpr /Zc:inline)
   endif ()
 endif ()