Disable constexpr fmt::formatted_size on Visual Studio 2019

Signed-off-by: Vladislav Shchapov <[email protected]>
fmtlib · Aug 3, 2024 · 67eb7ed · 67eb7ed
1 parent 523c374
commit 67eb7ed
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 5 deletions.
diff --git a/include/fmt/base.h b/include/fmt/base.h
@@ -929,7 +929,7 @@ template <typename T> class buffer {
 // Workaround for Visual Studio 2019 to fix error C2893: Failed to specialize
 // function template 'void fmt::v11::detail::buffer<T>::append(const U *,const
 // U *)'
-#ifndef FMT_DETAIL_EXPLICIT_INSTANTIATIONS
+#if !FMT_MSC_VERSION || FMT_MSC_VERSION >= 1930
   FMT_CONSTEXPR20
 #endif
       void

diff --git a/include/fmt/compile.h b/include/fmt/compile.h
@@ -488,8 +488,11 @@ auto format_to_n(OutputIt out, size_t n, const S& fmt, Args&&... args)
 
 template <typename S, typename... Args,
           FMT_ENABLE_IF(detail::is_compiled_string<S>::value)>
-FMT_CONSTEXPR20 auto formatted_size(const S& fmt, const Args&... args)
-    -> size_t {
+#if !FMT_MSC_VERSION || FMT_MSC_VERSION >= 1930
+FMT_CONSTEXPR20
+#endif
+    auto
+    formatted_size(const S& fmt, const Args&... args) -> size_t {
   auto buf = detail::counting_buffer<>();
   fmt::format_to(appender(buf), fmt, args...);
   return buf.count();

diff --git a/src/format.cc b/src/format.cc
@@ -5,7 +5,6 @@
 //
 // For the license information refer to format.h.
 
-#define FMT_DETAIL_EXPLICIT_INSTANTIATIONS 1
 #include "fmt/format-inl.h"
 
 FMT_BEGIN_NAMESPACE

diff --git a/test/compile-test.cc b/test/compile-test.cc
@@ -198,7 +198,7 @@ TEST(compile_test, format_to_n) {
   EXPECT_STREQ("2a", buffer);
 }
 
-#  if FMT_USE_CONSTEVAL
+#  if FMT_USE_CONSTEVAL && (!FMT_MSC_VERSION || FMT_MSC_VERSION >= 1930)
 TEST(compile_test, constexpr_formatted_size) {
   FMT_CONSTEXPR20 size_t size = fmt::formatted_size(FMT_COMPILE("{}"), 42);
   EXPECT_EQ(size, 2);