From 5ad54256c5425d120035c079501c5cbfcde48c55 Mon Sep 17 00:00:00 2001
From: Victor Zverovich <victor.zverovich@gmail.com>
Date: Mon, 21 May 2018 20:21:06 -0700
Subject: [PATCH] Fix a conflict between fmt::join and fmt/ostream.h (#744)

---
 include/fmt/ostream.h | 20 ++++++++++++++------
 test/ostream-test.cc  |  5 +++++
 2 files changed, 19 insertions(+), 6 deletions(-)

diff --git a/include/fmt/ostream.h b/include/fmt/ostream.h
index 5daa272b..cdb39047 100644
--- a/include/fmt/ostream.h
+++ b/include/fmt/ostream.h
@@ -53,10 +53,10 @@ struct test_stream : std::basic_ostream<Char> {
   void operator<<(null);
 };
 
-// Disable conversion to int if T has an overloaded operator<< which is a free
-// function (not a member of std::ostream).
+// Checks if T has an overloaded operator<< which is a free function (not a
+// member of std::ostream).
 template <typename T, typename Char>
-class convert_to_int<T, Char, true> {
+class is_streamable {
  private:
   template <typename U>
   static decltype(
@@ -69,7 +69,16 @@ class convert_to_int<T, Char, true> {
   typedef decltype(test<T>(0)) result;
 
  public:
-  static const bool value = !result::value;
+  static const bool value = result::value;
+};
+
+// Disable conversion to int if T has an overloaded operator<< which is a free
+// function (not a member of std::ostream).
+template <typename T, typename Char>
+class convert_to_int<T, Char, true> {
+ public:
+  static const bool value =
+    convert_to_int<T, Char, false>::value && !is_streamable<T, Char>::value;
 };
 
 // Write the content of buf to os.
@@ -106,8 +115,7 @@ struct format_enum<T,
 // Formats an object of type T that has an overloaded ostream operator<<.
 template <typename T, typename Char>
 struct formatter<T, Char,
-    typename std::enable_if<!internal::format_type<
-      typename buffer_context<Char>::type, T>::value>::type>
+    typename std::enable_if<internal::is_streamable<T, Char>::value>::type>
     : formatter<basic_string_view<Char>, Char> {
 
   template <typename Context>
diff --git a/test/ostream-test.cc b/test/ostream-test.cc
index bdb81651..ffc2f8b2 100644
--- a/test/ostream-test.cc
+++ b/test/ostream-test.cc
@@ -158,3 +158,8 @@ TEST(OStreamTest, WriteToOStreamMaxSize) {
   } while (size != 0);
   fmt::internal::write(os, buffer);
 }
+
+TEST(OStreamTest, Join) {
+  int v[3] = {1, 2, 3};
+  EXPECT_EQ("1, 2, 3", fmt::format("{}", fmt::join(v, v + 3, ", ")));
+}