From 4b0c14fe5a7fc28811520496943409ff20907055 Mon Sep 17 00:00:00 2001
From: Vinnie Falco <vinnie.falco@gmail.com>
Date: Tue, 13 Mar 2018 10:46:48 -0700
Subject: [PATCH] Use boost::is_convertible as a workaround

---
 CHANGELOG.md                                     | 6 ++++++
 include/boost/beast/core/detail/type_traits.hpp  | 5 +++--
 include/boost/beast/core/impl/buffers_prefix.ipp | 2 +-
 include/boost/beast/core/impl/buffers_suffix.ipp | 3 ++-
 4 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index dada71f4..33933b24 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,9 @@
+Version 166:
+
+* Use boost::is_convertible as a workaround
+
+--------------------------------------------------------------------------------
+
 Version 165:
 
 * Fix BOOST_NO_CXX11_ALLOCATOR check
diff --git a/include/boost/beast/core/detail/type_traits.hpp b/include/boost/beast/core/detail/type_traits.hpp
index d4233a95..3692b622 100644
--- a/include/boost/beast/core/detail/type_traits.hpp
+++ b/include/boost/beast/core/detail/type_traits.hpp
@@ -12,6 +12,7 @@
 
 #include <boost/beast/core/error.hpp>
 #include <boost/asio/buffer.hpp>
+#include <boost/type_traits.hpp>
 #include <iterator>
 #include <tuple>
 #include <type_traits>
@@ -309,7 +310,7 @@ template<class... Bn>
 struct common_buffers_type
 {
     using type = typename std::conditional<
-        std::is_convertible<std::tuple<Bn...>,
+        boost::is_convertible<std::tuple<Bn...>,
             typename repeat_tuple<sizeof...(Bn),
                 boost::asio::mutable_buffer>::type>::value,
                     boost::asio::mutable_buffer,
@@ -341,7 +342,7 @@ class buffers_range_adaptor
 
 public:
     using value_type = typename std::conditional<
-        std::is_convertible<
+        boost::is_convertible<
             typename std::iterator_traits<
                 typename buffer_sequence_iterator<
                     Buffers>::type>::value_type,
diff --git a/include/boost/beast/core/impl/buffers_prefix.ipp b/include/boost/beast/core/impl/buffers_prefix.ipp
index 0bb92cc3..a4548385 100644
--- a/include/boost/beast/core/impl/buffers_prefix.ipp
+++ b/include/boost/beast/core/impl/buffers_prefix.ipp
@@ -53,7 +53,7 @@ class buffers_prefix_view<BufferSequence>::const_iterator
 
 public:
     using value_type = typename std::conditional<
-        std::is_convertible<typename
+        boost::is_convertible<typename
             std::iterator_traits<iter_type>::value_type,
                 boost::asio::mutable_buffer>::value,
                     boost::asio::mutable_buffer,
diff --git a/include/boost/beast/core/impl/buffers_suffix.ipp b/include/boost/beast/core/impl/buffers_suffix.ipp
index 6356d63e..4385fe50 100644
--- a/include/boost/beast/core/impl/buffers_suffix.ipp
+++ b/include/boost/beast/core/impl/buffers_suffix.ipp
@@ -11,6 +11,7 @@
 #define BOOST_BEAST_IMPL_BUFFERS_SUFFIX_IPP
 
 #include <boost/beast/core/type_traits.hpp>
+#include <boost/type_traits.hpp>
 #include <algorithm>
 #include <cstdint>
 #include <iterator>
@@ -33,7 +34,7 @@ class buffers_suffix<Buffers>::const_iterator
 
 public:
     using value_type = typename std::conditional<
-        std::is_convertible<typename
+        boost::is_convertible<typename
             std::iterator_traits<iter_type>::value_type,
                 boost::asio::mutable_buffer>::value,
                     boost::asio::mutable_buffer,