forked from boostorg/beast
Use boost::is_convertible as a workaround
This commit is contained in:
@@ -1,3 +1,9 @@
|
||||
Version 166:
|
||||
|
||||
* Use boost::is_convertible as a workaround
|
||||
|
||||
--------------------------------------------------------------------------------
|
||||
|
||||
Version 165:
|
||||
|
||||
* Fix BOOST_NO_CXX11_ALLOCATOR check
|
||||
|
@@ -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,
|
||||
|
@@ -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,
|
||||
|
@@ -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,
|
||||
|
Reference in New Issue
Block a user