Reintroduce ostream support to range formatters (#2014)

fmtlib · Nov 24, 2020 · 5899276 · 5899276
1 parent b8957f5
commit 5899276
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/include/fmt/ranges.h b/include/fmt/ranges.h
@@ -254,7 +254,10 @@ struct formatter<
     enable_if_t<fmt::is_range<T, Char>::value
 // Workaround a bug in MSVC 2017 and earlier.
 #if !FMT_MSC_VER || FMT_MSC_VER >= 1927
-                && has_formatter<detail::value_type<T>, format_context>::value
+                &&
+                (has_formatter<detail::value_type<T>, format_context>::value ||
+                 detail::has_fallback_formatter<detail::value_type<T>,
+                                                format_context>::value)
 #endif
                 >> {
   formatting_range<Char> formatting;

diff --git a/test/ostream-test.cc b/test/ostream-test.cc
@@ -5,7 +5,6 @@
 //
 // For the license information refer to format.h.
 
-#define FMT_STRING_ALIAS 1
 #include "fmt/format.h"
 
 struct test {};
@@ -24,6 +23,7 @@ template <> struct formatter<test> : formatter<int> {
 #include <sstream>
 
 #include "fmt/ostream.h"
+#include "fmt/ranges.h"
 #include "gmock.h"
 #include "gtest-extra.h"
 #include "util.h"
@@ -323,3 +323,8 @@ TEST(OStreamTest, CompileTimeString) {
 TEST(OStreamTest, ToString) {
   EXPECT_EQ("ABC", fmt::to_string(fmt_test::ABC()));
 }
+
+TEST(OStreamTest, Range) {
+  auto strs = std::vector<TestString>{TestString("foo"), TestString("bar")};
+  EXPECT_EQ("{foo, bar}", format("{}", strs));
+}