Fix MSVC build, take 2

test/custom-formatter-test.cc

@@ -8,6 +8,9 @@
 #include "fmt/format.h"
 #include "gtest-extra.h"
 
+// MSVC 2013 is known to be broken.
+#if !FMT_MSC_VER || FMT_MSC_VER > 1800
+
 // A custom argument formatter that doesn't print `-` for floating-point values
 // rounded to 0.
 class custom_arg_formatter :
@@ -22,21 +25,14 @@ class custom_arg_formatter :
   using base::operator();
 
   iterator operator()(double value) {
-#if FMT_GCC_VERSION
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wfloat-equal"
-#endif
     // Comparing a float to 0.0 is safe
     if (round(value * pow(10, spec().precision())) == 0.0)
       value = 0;
     return base::operator()(value);
-#if FMT_GCC_VERSION
-#pragma GCC diagnostic pop
-#endif
   }
 };
 
-static std::string custom_vformat(fmt::string_view format_str, fmt::format_args args) {
+std::string custom_vformat(fmt::string_view format_str, fmt::format_args args) {
   fmt::memory_buffer buffer;
   // Pass custom argument formatter as a template arg to vwrite.
   fmt::vformat_to<custom_arg_formatter>(buffer, format_str, args);
@@ -52,3 +48,4 @@ std::string custom_format(const char *format_str, const Args & ... args) {
 TEST(CustomFormatterTest, Format) {
   EXPECT_EQ("0.00", custom_format("{:.2f}", -.00001));
 }
+#endif

test/format-test.cc

@@ -1423,13 +1423,19 @@ class mock_arg_formatter:
     EXPECT_CALL(*this, call(42));
   }
 
-  using base::operator();
-
-  iterator operator()(int value) {
+  template <typename T>
+  typename std::enable_if<std::is_integral<T>::value, iterator>::type
+      operator()(T value) {
     call(value);
     return base::operator()(value);
   }
 
+  template <typename T>
+  typename std::enable_if<!std::is_integral<T>::value, iterator>::type
+      operator()(T value) {
+    return base::operator()(value);
+  }
+
   iterator operator()(fmt::basic_format_arg<fmt::format_context>::handle) {
     return base::operator()(fmt::monostate());
   }

test/ostream-test.cc

@@ -164,6 +164,8 @@ TEST(OStreamTest, Join) {
   EXPECT_EQ("1, 2, 3", fmt::format("{}", fmt::join(v, v + 3, ", ")));
 }
 
+#if FMT_USE_CONSTEXPR
 TEST(OStreamTest, ConstexprString) {
   EXPECT_EQ("42", format(fmt("{}"), std::string("42")));
 }
+#endif

test/ranges-test.cc

@@ -11,6 +11,10 @@
 
 #include "fmt/ranges.h"
 
+/// Check if  'if constexpr' is supported.
+#if (__cplusplus > 201402L) || \
+    (defined(_MSVC_LANG) && _MSVC_LANG > 201402L && _MSC_VER >= 1910)
+
 #include "gtest.h"
 
 #include <vector>
@@ -46,10 +50,6 @@ TEST(RangesTest, FormatTuple) {
   EXPECT_EQ("(42, 3.14159, \"this is tuple\", 'i')", fmt::format("{}", tu1));
 }
 
-/// Check if  'if constexpr' is supported.
-#if (__cplusplus > 201402L) || \
-    (defined(_MSVC_LANG) && _MSVC_LANG > 201402L && _MSC_VER >= 1910)
-
 struct my_struct {
   int32_t i;
   std::string str;  // can throw