feedc0de/boost_beast
1
0
Fork 0
forked from boostorg/beast
Code Pull Requests Activity

Use boost::is_convertible as a workaround

Browse Source
This commit is contained in:
Vinnie Falco
2018-03-13 10:46:48 -07:00
parent a03687eaa3
commit 4b0c14fe5a
4 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
CHANGELOG.md
View File

@@ -1,3 +1,9 @@
Version 166:
* Use boost::is_convertible as a workaround
--------------------------------------------------------------------------------
Version 165: Version 165:
* Fix BOOST_NO_CXX11_ALLOCATOR check * Fix BOOST_NO_CXX11_ALLOCATOR check

5
include/boost/beast/core/detail/type_traits.hpp
View File

@@ -12,6 +12,7 @@
#include <boost/beast/core/error.hpp> #include <boost/beast/core/error.hpp>
#include <boost/asio/buffer.hpp> #include <boost/asio/buffer.hpp>
#include <boost/type_traits.hpp>
#include <iterator> #include <iterator>
#include <tuple> #include <tuple>
#include <type_traits> #include <type_traits>
@@ -309,7 +310,7 @@ template<class... Bn>
struct common_buffers_type struct common_buffers_type
{ {
using type = typename std::conditional< using type = typename std::conditional<
std::is_convertible<std::tuple<Bn...>, boost::is_convertible<std::tuple<Bn...>,
typename repeat_tuple<sizeof...(Bn), typename repeat_tuple<sizeof...(Bn),
boost::asio::mutable_buffer>::type>::value, boost::asio::mutable_buffer>::type>::value,
boost::asio::mutable_buffer, boost::asio::mutable_buffer,
@@ -341,7 +342,7 @@ class buffers_range_adaptor
public: public:
using value_type = typename std::conditional< using value_type = typename std::conditional<
std::is_convertible< boost::is_convertible<
typename std::iterator_traits< typename std::iterator_traits<
typename buffer_sequence_iterator< typename buffer_sequence_iterator<
Buffers>::type>::value_type, Buffers>::type>::value_type,

2
include/boost/beast/core/impl/buffers_prefix.ipp
View File

@@ -53,7 +53,7 @@ class buffers_prefix_view<BufferSequence>::const_iterator
public: public:
using value_type = typename std::conditional< using value_type = typename std::conditional<
std::is_convertible<typename boost::is_convertible<typename
std::iterator_traits<iter_type>::value_type, std::iterator_traits<iter_type>::value_type,
boost::asio::mutable_buffer>::value, boost::asio::mutable_buffer>::value,
boost::asio::mutable_buffer, boost::asio::mutable_buffer,

3
include/boost/beast/core/impl/buffers_suffix.ipp
View File

@@ -11,6 +11,7 @@
#define BOOST_BEAST_IMPL_BUFFERS_SUFFIX_IPP #define BOOST_BEAST_IMPL_BUFFERS_SUFFIX_IPP
#include <boost/beast/core/type_traits.hpp> #include <boost/beast/core/type_traits.hpp>
#include <boost/type_traits.hpp>
#include <algorithm> #include <algorithm>
#include <cstdint> #include <cstdint>
#include <iterator> #include <iterator>
@@ -33,7 +34,7 @@ class buffers_suffix<Buffers>::const_iterator
public: public:
using value_type = typename std::conditional< using value_type = typename std::conditional<
std::is_convertible<typename boost::is_convertible<typename
std::iterator_traits<iter_type>::value_type, std::iterator_traits<iter_type>::value_type,
boost::asio::mutable_buffer>::value, boost::asio::mutable_buffer>::value,
boost::asio::mutable_buffer, boost::asio::mutable_buffer,