forked from boostorg/iterator
Remove BOOST_NO_STRICT_ITERATOR_INTEROPERABILITY
Correct static_assert messages. Fix messages & replace is_standard_layout with is_copy_constructible.
This commit is contained in:
@@ -433,9 +433,7 @@ namespace iterators {
|
||||
struct use_operator_brackets_proxy
|
||||
: detail::negation<
|
||||
detail::conjunction<
|
||||
// Really we want an is_copy_constructible trait here,
|
||||
// but is_POD will have to suffice in the meantime.
|
||||
std::is_standard_layout<ValueType>
|
||||
std::is_copy_constructible<ValueType>
|
||||
, std::is_trivial<ValueType>
|
||||
, iterator_writability_disabled<ValueType,Reference>
|
||||
>
|
||||
@@ -908,11 +906,6 @@ namespace iterators {
|
||||
# define BOOST_ITERATOR_FACADE_INTEROP(op, result_type, return_prefix, base_op) \
|
||||
BOOST_ITERATOR_FACADE_INTEROP_HEAD(inline, op, result_type) \
|
||||
{ \
|
||||
/* For those compilers that do not support enable_if */ \
|
||||
static_assert( \
|
||||
is_interoperable<Derived1, Derived2>::value, \
|
||||
"Derived1 & Derived2 types must be interoperable." \
|
||||
); \
|
||||
return_prefix iterator_core_access::base_op( \
|
||||
*static_cast<Derived1 const*>(&lhs) \
|
||||
, *static_cast<Derived2 const*>(&rhs) \
|
||||
@@ -938,16 +931,6 @@ namespace iterators {
|
||||
BOOST_ITERATOR_FACADE_INTEROP_RANDOM_ACCESS_HEAD(inline, op, result_type) \
|
||||
{ \
|
||||
using boost::iterators::detail::is_traversal_at_least; \
|
||||
typedef typename iterator_category<Derived1>::type Derived1IterCat; \
|
||||
typedef typename iterator_category<Derived2>::type Derived2IterCat; \
|
||||
/* For those compilers that do not support enable_if */ \
|
||||
static_assert( \
|
||||
is_interoperable<Derived1, Derived2>::value && \
|
||||
is_traversal_at_least<Derived1IterCat, random_access_traversal_tag>::value && \
|
||||
is_traversal_at_least<Derived2IterCat, random_access_traversal_tag>::value, \
|
||||
"Derived1 & Derived2 types must be interoperable and must both have " \
|
||||
"random_access_traversal_tag." \
|
||||
); \
|
||||
return_prefix iterator_core_access::base_op( \
|
||||
*static_cast<Derived1 const*>(&lhs) \
|
||||
, *static_cast<Derived2 const*>(&rhs) \
|
||||
|
||||
Reference in New Issue
Block a user