diff --git a/include/boost/range/algorithm/adjacent_find.hpp b/include/boost/range/algorithm/adjacent_find.hpp index c42e5ee..1b88dae 100755 --- a/include/boost/range/algorithm/adjacent_find.hpp +++ b/include/boost/range/algorithm/adjacent_find.hpp @@ -32,7 +32,7 @@ template< typename ForwardRange > inline typename range_iterator::type adjacent_find(ForwardRange & rng) { - BOOST_CONCEPT_ASSERT((ForwardRangeConcept)); + BOOST_RANGE_CONCEPT_ASSERT((ForwardRangeConcept)); return std::adjacent_find(boost::begin(rng),boost::end(rng)); } @@ -41,7 +41,7 @@ template< typename ForwardRange > inline typename range_iterator::type adjacent_find(const ForwardRange& rng) { - BOOST_CONCEPT_ASSERT((ForwardRangeConcept)); + BOOST_RANGE_CONCEPT_ASSERT((ForwardRangeConcept)); return std::adjacent_find(boost::begin(rng),boost::end(rng)); } @@ -50,8 +50,8 @@ template< typename ForwardRange, typename BinaryPredicate > inline typename range_iterator::type adjacent_find(ForwardRange & rng, BinaryPredicate pred) { - BOOST_CONCEPT_ASSERT((ForwardRangeConcept)); - BOOST_CONCEPT_ASSERT((BinaryPredicateConcept)); + BOOST_RANGE_CONCEPT_ASSERT((BinaryPredicateConcept::type, typename range_value::type>)); return std::adjacent_find(boost::begin(rng),boost::end(rng),pred); @@ -62,8 +62,8 @@ template< typename ForwardRange, typename BinaryPredicate > inline typename range_iterator::type adjacent_find(const ForwardRange& rng, BinaryPredicate pred) { - BOOST_CONCEPT_ASSERT((ForwardRangeConcept)); - BOOST_CONCEPT_ASSERT((BinaryPredicateConcept)); + BOOST_RANGE_CONCEPT_ASSERT((BinaryPredicateConcept::type, typename range_value::type>)); return std::adjacent_find(boost::begin(rng),boost::end(rng),pred); @@ -76,7 +76,7 @@ template< range_return_value re, typename ForwardRange > inline typename range_return::type adjacent_find(ForwardRange & rng) { - BOOST_CONCEPT_ASSERT((ForwardRangeConcept)); + BOOST_RANGE_CONCEPT_ASSERT((ForwardRangeConcept)); return range_return:: pack(std::adjacent_find(boost::begin(rng),boost::end(rng)), rng); @@ -87,7 +87,7 @@ template< range_return_value re, typename ForwardRange > inline typename range_return::type adjacent_find(const ForwardRange& rng) { - BOOST_CONCEPT_ASSERT((ForwardRangeConcept)); + BOOST_RANGE_CONCEPT_ASSERT((ForwardRangeConcept)); return range_return:: pack(std::adjacent_find(boost::begin(rng),boost::end(rng)), rng); @@ -98,8 +98,8 @@ template< range_return_value re, typename ForwardRange, typename BinaryPredicate inline typename range_return::type adjacent_find(ForwardRange& rng, BinaryPredicate pred) { - BOOST_CONCEPT_ASSERT((ForwardRangeConcept)); - BOOST_CONCEPT_ASSERT((BinaryPredicateConcept)); + BOOST_RANGE_CONCEPT_ASSERT((BinaryPredicateConcept::type, typename range_value::type>)); return range_return:: @@ -112,7 +112,7 @@ template< range_return_value re, typename ForwardRange, typename BinaryPredicate inline typename range_return::type adjacent_find(const ForwardRange& rng, BinaryPredicate pred) { - BOOST_CONCEPT_ASSERT((ForwardRangeConcept)); + BOOST_RANGE_CONCEPT_ASSERT((ForwardRangeConcept)); return range_return:: pack(std::adjacent_find(boost::begin(rng),boost::end(rng),pred), rng); diff --git a/include/boost/range/algorithm/binary_search.hpp b/include/boost/range/algorithm/binary_search.hpp index 41860a5..bb64ec8 100755 --- a/include/boost/range/algorithm/binary_search.hpp +++ b/include/boost/range/algorithm/binary_search.hpp @@ -29,7 +29,7 @@ namespace boost template inline bool binary_search(const ForwardRange& rng, const Value& val) { - BOOST_CONCEPT_ASSERT(( ForwardRangeConcept )); + BOOST_RANGE_CONCEPT_ASSERT(( ForwardRangeConcept )); return std::binary_search(boost::begin(rng), boost::end(rng), val); } @@ -38,7 +38,7 @@ template inline bool binary_search(const ForwardRange& rng, const Value& val, BinaryPredicate pred) { - BOOST_CONCEPT_ASSERT(( ForwardRangeConcept )); + BOOST_RANGE_CONCEPT_ASSERT(( ForwardRangeConcept )); return std::binary_search(boost::begin(rng), boost::end(rng), val, pred); } diff --git a/include/boost/range/algorithm/copy.hpp b/include/boost/range/algorithm/copy.hpp index b097d00..dc5a0c3 100644 --- a/include/boost/range/algorithm/copy.hpp +++ b/include/boost/range/algorithm/copy.hpp @@ -30,7 +30,7 @@ namespace boost template< class SinglePassRange, class OutputIterator > inline OutputIterator copy(const SinglePassRange& rng, OutputIterator out) { - BOOST_CONCEPT_ASSERT(( SinglePassRangeConcept )); + BOOST_RANGE_CONCEPT_ASSERT(( SinglePassRangeConcept )); return std::copy(boost::begin(rng),boost::end(rng),out); } diff --git a/include/boost/range/algorithm/copy_backward.hpp b/include/boost/range/algorithm/copy_backward.hpp index fddd0a8..52dc922 100755 --- a/include/boost/range/algorithm/copy_backward.hpp +++ b/include/boost/range/algorithm/copy_backward.hpp @@ -32,7 +32,7 @@ inline BidirectionalTraversalWriteableIterator copy_backward(const BidirectionalRange& rng, BidirectionalTraversalWriteableIterator out) { - BOOST_CONCEPT_ASSERT(( BidirectionalRangeConcept )); + BOOST_RANGE_CONCEPT_ASSERT(( BidirectionalRangeConcept )); return std::copy_backward(boost::begin(rng), boost::end(rng), out); } diff --git a/include/boost/range/algorithm/count.hpp b/include/boost/range/algorithm/count.hpp index ab4fdd1..8316ce0 100755 --- a/include/boost/range/algorithm/count.hpp +++ b/include/boost/range/algorithm/count.hpp @@ -30,7 +30,7 @@ template< class SinglePassRange, class Value > inline BOOST_DEDUCED_TYPENAME range_difference::type count(SinglePassRange& rng, const Value& val) { - BOOST_CONCEPT_ASSERT(( SinglePassRangeConcept )); + BOOST_RANGE_CONCEPT_ASSERT(( SinglePassRangeConcept )); return std::count(boost::begin(rng), boost::end(rng), val); } @@ -39,7 +39,7 @@ template< class SinglePassRange, class Value > inline BOOST_DEDUCED_TYPENAME range_difference::type count(const SinglePassRange& rng, const Value& val) { - BOOST_CONCEPT_ASSERT(( SinglePassRangeConcept )); + BOOST_RANGE_CONCEPT_ASSERT(( SinglePassRangeConcept )); return std::count(boost::begin(rng), boost::end(rng), val); } diff --git a/include/boost/range/algorithm/count_if.hpp b/include/boost/range/algorithm/count_if.hpp index 611312c..ae17b0e 100755 --- a/include/boost/range/algorithm/count_if.hpp +++ b/include/boost/range/algorithm/count_if.hpp @@ -31,7 +31,7 @@ template< class SinglePassRange, class UnaryPredicate > inline BOOST_DEDUCED_TYPENAME boost::range_difference::type count_if(SinglePassRange& rng, UnaryPredicate pred) { - BOOST_CONCEPT_ASSERT(( SinglePassRangeConcept )); + BOOST_RANGE_CONCEPT_ASSERT(( SinglePassRangeConcept )); return std::count_if(boost::begin(rng), boost::end(rng), pred); } @@ -40,7 +40,7 @@ template< class SinglePassRange, class UnaryPredicate > inline BOOST_DEDUCED_TYPENAME boost::range_difference::type count_if(const SinglePassRange& rng, UnaryPredicate pred) { - BOOST_CONCEPT_ASSERT(( SinglePassRangeConcept )); + BOOST_RANGE_CONCEPT_ASSERT(( SinglePassRangeConcept )); return std::count_if(boost::begin(rng), boost::end(rng), pred); } diff --git a/include/boost/range/algorithm/equal.hpp b/include/boost/range/algorithm/equal.hpp index e9a16fd..e210ef5 100755 --- a/include/boost/range/algorithm/equal.hpp +++ b/include/boost/range/algorithm/equal.hpp @@ -159,8 +159,8 @@ namespace boost template< class SinglePassRange1, class SinglePassRange2 > inline bool equal( const SinglePassRange1& rng1, const SinglePassRange2& rng2 ) { - BOOST_CONCEPT_ASSERT(( SinglePassRangeConcept )); - BOOST_CONCEPT_ASSERT(( SinglePassRangeConcept )); + BOOST_RANGE_CONCEPT_ASSERT(( SinglePassRangeConcept )); + BOOST_RANGE_CONCEPT_ASSERT(( SinglePassRangeConcept )); return ::boost::range_detail::equal( ::boost::begin(rng1), ::boost::end(rng1), @@ -172,8 +172,8 @@ namespace boost inline bool equal( const SinglePassRange1& rng1, const SinglePassRange2& rng2, BinaryPredicate pred ) { - BOOST_CONCEPT_ASSERT(( SinglePassRangeConcept )); - BOOST_CONCEPT_ASSERT(( SinglePassRangeConcept )); + BOOST_RANGE_CONCEPT_ASSERT(( SinglePassRangeConcept )); + BOOST_RANGE_CONCEPT_ASSERT(( SinglePassRangeConcept )); return ::boost::range_detail::equal( ::boost::begin(rng1), ::boost::end(rng1), diff --git a/include/boost/range/algorithm/equal_range.hpp b/include/boost/range/algorithm/equal_range.hpp index 0643701..4aa4a54 100755 --- a/include/boost/range/algorithm/equal_range.hpp +++ b/include/boost/range/algorithm/equal_range.hpp @@ -33,7 +33,7 @@ inline std::pair< > equal_range(ForwardRange& rng, const Value& val) { - BOOST_CONCEPT_ASSERT(( ForwardRangeConcept )); + BOOST_RANGE_CONCEPT_ASSERT(( ForwardRangeConcept )); return std::equal_range(boost::begin(rng), boost::end(rng), val); } @@ -45,7 +45,7 @@ inline std::pair< > equal_range(const ForwardRange& rng, const Value& val) { - BOOST_CONCEPT_ASSERT(( ForwardRangeConcept )); + BOOST_RANGE_CONCEPT_ASSERT(( ForwardRangeConcept )); return std::equal_range(boost::begin(rng), boost::end(rng), val); } @@ -57,7 +57,7 @@ inline std::pair< > equal_range(ForwardRange& rng, const Value& val, SortPredicate pred) { - BOOST_CONCEPT_ASSERT(( ForwardRangeConcept )); + BOOST_RANGE_CONCEPT_ASSERT(( ForwardRangeConcept )); return std::equal_range(boost::begin(rng), boost::end(rng), val, pred); } @@ -69,7 +69,7 @@ inline std::pair< > equal_range(const ForwardRange& rng, const Value& val, SortPredicate pred) { - BOOST_CONCEPT_ASSERT(( ForwardRangeConcept )); + BOOST_RANGE_CONCEPT_ASSERT(( ForwardRangeConcept )); return std::equal_range(boost::begin(rng), boost::end(rng), val, pred); } diff --git a/include/boost/range/algorithm/fill.hpp b/include/boost/range/algorithm/fill.hpp index 4d4d750..72c5d58 100755 --- a/include/boost/range/algorithm/fill.hpp +++ b/include/boost/range/algorithm/fill.hpp @@ -28,7 +28,7 @@ namespace boost template< class ForwardRange, class Value > inline ForwardRange& fill(ForwardRange& rng, const Value& val) { - BOOST_CONCEPT_ASSERT(( ForwardRangeConcept )); + BOOST_RANGE_CONCEPT_ASSERT(( ForwardRangeConcept )); std::fill(boost::begin(rng), boost::end(rng), val); return rng; } diff --git a/include/boost/range/algorithm/fill_n.hpp b/include/boost/range/algorithm/fill_n.hpp index a6c32bd..f827135 100755 --- a/include/boost/range/algorithm/fill_n.hpp +++ b/include/boost/range/algorithm/fill_n.hpp @@ -29,7 +29,7 @@ namespace boost template< class ForwardRange, class Size, class Value > inline ForwardRange& fill_n(ForwardRange& rng, Size n, const Value& val) { - BOOST_CONCEPT_ASSERT(( ForwardRangeConcept )); + BOOST_RANGE_CONCEPT_ASSERT(( ForwardRangeConcept )); BOOST_ASSERT( static_cast(std::distance(boost::begin(rng), boost::end(rng))) >= n ); std::fill_n(boost::begin(rng), n, val); return rng; diff --git a/include/boost/range/algorithm/find.hpp b/include/boost/range/algorithm/find.hpp index df39efe..b4bf6d9 100755 --- a/include/boost/range/algorithm/find.hpp +++ b/include/boost/range/algorithm/find.hpp @@ -30,7 +30,7 @@ template< class SinglePassRange, class Value > inline BOOST_DEDUCED_TYPENAME range_iterator::type find( SinglePassRange& rng, const Value& val ) { - BOOST_CONCEPT_ASSERT(( SinglePassRangeConcept )); + BOOST_RANGE_CONCEPT_ASSERT(( SinglePassRangeConcept )); return std::find(boost::begin(rng), boost::end(rng), val); } @@ -41,7 +41,7 @@ template< range_return_value re, class SinglePassRange, class Value > inline BOOST_DEDUCED_TYPENAME range_return::type find( SinglePassRange& rng, const Value& val ) { - BOOST_CONCEPT_ASSERT(( SinglePassRangeConcept )); + BOOST_RANGE_CONCEPT_ASSERT(( SinglePassRangeConcept )); return range_return:: pack(std::find(boost::begin(rng), boost::end(rng), val), rng); diff --git a/include/boost/range/algorithm/find_end.hpp b/include/boost/range/algorithm/find_end.hpp index 5f4fada..864d4b0 100755 --- a/include/boost/range/algorithm/find_end.hpp +++ b/include/boost/range/algorithm/find_end.hpp @@ -32,8 +32,8 @@ template< class ForwardRange1, class ForwardRange2 > inline BOOST_DEDUCED_TYPENAME range_iterator< ForwardRange1 >::type find_end(ForwardRange1 & rng1, const ForwardRange2& rng2) { - BOOST_CONCEPT_ASSERT(( ForwardRangeConcept )); - BOOST_CONCEPT_ASSERT(( ForwardRangeConcept )); + BOOST_RANGE_CONCEPT_ASSERT(( ForwardRangeConcept )); + BOOST_RANGE_CONCEPT_ASSERT(( ForwardRangeConcept )); return std::find_end(boost::begin(rng1),boost::end(rng1), boost::begin(rng2),boost::end(rng2)); @@ -44,8 +44,8 @@ template< class ForwardRange1, class ForwardRange2, class BinaryPredicate > inline BOOST_DEDUCED_TYPENAME range_iterator::type find_end(ForwardRange1 & rng1, const ForwardRange2& rng2, BinaryPredicate pred) { - BOOST_CONCEPT_ASSERT(( ForwardRangeConcept )); - BOOST_CONCEPT_ASSERT(( ForwardRangeConcept )); + BOOST_RANGE_CONCEPT_ASSERT(( ForwardRangeConcept )); + BOOST_RANGE_CONCEPT_ASSERT(( ForwardRangeConcept )); return std::find_end(boost::begin(rng1),boost::end(rng1), boost::begin(rng2),boost::end(rng2),pred); @@ -56,8 +56,8 @@ template< range_return_value re, class ForwardRange1, class ForwardRange2 > inline BOOST_DEDUCED_TYPENAME range_return::type find_end(ForwardRange1& rng1, const ForwardRange2& rng2) { - BOOST_CONCEPT_ASSERT(( ForwardRangeConcept )); - BOOST_CONCEPT_ASSERT(( ForwardRangeConcept )); + BOOST_RANGE_CONCEPT_ASSERT(( ForwardRangeConcept )); + BOOST_RANGE_CONCEPT_ASSERT(( ForwardRangeConcept )); return range_return:: pack(std::find_end(boost::begin(rng1), boost::end(rng1), @@ -71,8 +71,8 @@ template< range_return_value re, class ForwardRange1, class ForwardRange2, inline BOOST_DEDUCED_TYPENAME range_return::type find_end(ForwardRange1& rng1, const ForwardRange2& rng2, BinaryPredicate pred) { - BOOST_CONCEPT_ASSERT(( ForwardRangeConcept )); - BOOST_CONCEPT_ASSERT(( ForwardRangeConcept )); + BOOST_RANGE_CONCEPT_ASSERT(( ForwardRangeConcept )); + BOOST_RANGE_CONCEPT_ASSERT(( ForwardRangeConcept )); return range_return:: pack(std::find_end(boost::begin(rng1), boost::end(rng1), diff --git a/include/boost/range/algorithm/find_first_of.hpp b/include/boost/range/algorithm/find_first_of.hpp index 4bd304e..f7543b7 100755 --- a/include/boost/range/algorithm/find_first_of.hpp +++ b/include/boost/range/algorithm/find_first_of.hpp @@ -32,8 +32,8 @@ template< class SinglePassRange1, class ForwardRange2 > inline BOOST_DEDUCED_TYPENAME range_iterator::type find_first_of(SinglePassRange1 & rng1, ForwardRange2 const & rng2) { - BOOST_CONCEPT_ASSERT(( SinglePassRangeConcept )); - BOOST_CONCEPT_ASSERT(( ForwardRangeConcept )); + BOOST_RANGE_CONCEPT_ASSERT(( SinglePassRangeConcept )); + BOOST_RANGE_CONCEPT_ASSERT(( ForwardRangeConcept )); return std::find_first_of(boost::begin(rng1),boost::end(rng1), boost::begin(rng2),boost::end(rng2)); @@ -44,8 +44,8 @@ template< class SinglePassRange1, class ForwardRange2, class BinaryPredicate > inline BOOST_DEDUCED_TYPENAME range_iterator::type find_first_of(SinglePassRange1 & rng1, ForwardRange2 const & rng2, BinaryPredicate pred) { - BOOST_CONCEPT_ASSERT(( SinglePassRangeConcept )); - BOOST_CONCEPT_ASSERT(( ForwardRangeConcept )); + BOOST_RANGE_CONCEPT_ASSERT(( SinglePassRangeConcept )); + BOOST_RANGE_CONCEPT_ASSERT(( ForwardRangeConcept )); return std::find_first_of(boost::begin(rng1),boost::end(rng1), boost::begin(rng2),boost::end(rng2),pred); @@ -57,8 +57,8 @@ template< range_return_value re, class SinglePassRange1, class ForwardRange2 > inline BOOST_DEDUCED_TYPENAME range_return::type find_first_of(SinglePassRange1& rng1, const ForwardRange2& rng2) { - BOOST_CONCEPT_ASSERT(( SinglePassRangeConcept )); - BOOST_CONCEPT_ASSERT(( ForwardRangeConcept )); + BOOST_RANGE_CONCEPT_ASSERT(( SinglePassRangeConcept )); + BOOST_RANGE_CONCEPT_ASSERT(( ForwardRangeConcept )); return range_return:: pack(std::find_first_of(boost::begin(rng1), boost::end(rng1), @@ -73,8 +73,8 @@ inline BOOST_DEDUCED_TYPENAME range_return::type find_first_of(SinglePassRange1 & rng1, const ForwardRange2& rng2, BinaryPredicate pred) { - BOOST_CONCEPT_ASSERT(( SinglePassRangeConcept )); - BOOST_CONCEPT_ASSERT(( ForwardRangeConcept )); + BOOST_RANGE_CONCEPT_ASSERT(( SinglePassRangeConcept )); + BOOST_RANGE_CONCEPT_ASSERT(( ForwardRangeConcept )); return range_return:: pack(std::find_first_of(boost::begin(rng1), boost::end(rng1), diff --git a/include/boost/range/algorithm/find_if.hpp b/include/boost/range/algorithm/find_if.hpp index 1a42e3a..3254d8c 100755 --- a/include/boost/range/algorithm/find_if.hpp +++ b/include/boost/range/algorithm/find_if.hpp @@ -31,7 +31,7 @@ template< class SinglePassRange, class UnaryPredicate > inline BOOST_DEDUCED_TYPENAME range_iterator::type find_if( SinglePassRange& rng, UnaryPredicate pred ) { - BOOST_CONCEPT_ASSERT(( SinglePassRangeConcept )); + BOOST_RANGE_CONCEPT_ASSERT(( SinglePassRangeConcept )); return std::find_if(boost::begin(rng), boost::end(rng), pred); } @@ -42,7 +42,7 @@ template< range_return_value re, class SinglePassRange, class UnaryPredicate > inline BOOST_DEDUCED_TYPENAME range_return::type find_if( SinglePassRange& rng, UnaryPredicate pred ) { - BOOST_CONCEPT_ASSERT(( SinglePassRangeConcept )); + BOOST_RANGE_CONCEPT_ASSERT(( SinglePassRangeConcept )); return range_return:: pack(std::find_if(boost::begin(rng), boost::end(rng), pred), rng); diff --git a/include/boost/range/algorithm/for_each.hpp b/include/boost/range/algorithm/for_each.hpp index 5145432..cc65e6e 100755 --- a/include/boost/range/algorithm/for_each.hpp +++ b/include/boost/range/algorithm/for_each.hpp @@ -29,7 +29,7 @@ namespace boost template< class SinglePassRange, class UnaryFunction > inline UnaryFunction for_each(SinglePassRange & rng, UnaryFunction fun) { - BOOST_CONCEPT_ASSERT(( SinglePassRangeConcept )); + BOOST_RANGE_CONCEPT_ASSERT(( SinglePassRangeConcept )); return std::for_each(boost::begin(rng),boost::end(rng),fun); } @@ -37,7 +37,7 @@ inline UnaryFunction for_each(SinglePassRange & rng, UnaryFunction fun) template< class SinglePassRange, class UnaryFunction > inline UnaryFunction for_each(SinglePassRange const & rng, UnaryFunction fun) { - BOOST_CONCEPT_ASSERT(( SinglePassRangeConcept )); + BOOST_RANGE_CONCEPT_ASSERT(( SinglePassRangeConcept )); return std::for_each(boost::begin(rng),boost::end(rng),fun); } diff --git a/include/boost/range/algorithm/generate.hpp b/include/boost/range/algorithm/generate.hpp index 7b7dde7..97a0d9d 100755 --- a/include/boost/range/algorithm/generate.hpp +++ b/include/boost/range/algorithm/generate.hpp @@ -28,7 +28,7 @@ namespace boost template< class ForwardRange, class Generator > inline ForwardRange& generate( ForwardRange& rng, Generator gen ) { - BOOST_CONCEPT_ASSERT(( ForwardRangeConcept )); + BOOST_RANGE_CONCEPT_ASSERT(( ForwardRangeConcept )); std::generate(boost::begin(rng), boost::end(rng), gen); return rng; } @@ -37,7 +37,7 @@ inline ForwardRange& generate( ForwardRange& rng, Generator gen ) template< class ForwardRange, class Generator > inline const ForwardRange& generate(const ForwardRange& rng, Generator gen) { - BOOST_CONCEPT_ASSERT(( ForwardRangeConcept )); + BOOST_RANGE_CONCEPT_ASSERT(( ForwardRangeConcept )); std::generate(boost::begin(rng), boost::end(rng), gen); return rng; } diff --git a/include/boost/range/algorithm/heap_algorithm.hpp b/include/boost/range/algorithm/heap_algorithm.hpp index 05c9013..857a30f 100755 --- a/include/boost/range/algorithm/heap_algorithm.hpp +++ b/include/boost/range/algorithm/heap_algorithm.hpp @@ -29,7 +29,7 @@ namespace boost template inline void push_heap(RandomAccessRange& rng) { - BOOST_CONCEPT_ASSERT(( RandomAccessRangeConcept )); + BOOST_RANGE_CONCEPT_ASSERT(( RandomAccessRangeConcept )); std::push_heap(boost::begin(rng), boost::end(rng)); } @@ -37,7 +37,7 @@ inline void push_heap(RandomAccessRange& rng) template inline void push_heap(const RandomAccessRange& rng) { - BOOST_CONCEPT_ASSERT(( RandomAccessRangeConcept )); + BOOST_RANGE_CONCEPT_ASSERT(( RandomAccessRangeConcept )); std::push_heap(boost::begin(rng), boost::end(rng)); } @@ -45,7 +45,7 @@ inline void push_heap(const RandomAccessRange& rng) template inline void push_heap(RandomAccessRange& rng, Compare comp_pred) { - BOOST_CONCEPT_ASSERT(( RandomAccessRangeConcept )); + BOOST_RANGE_CONCEPT_ASSERT(( RandomAccessRangeConcept )); std::push_heap(boost::begin(rng), boost::end(rng), comp_pred); } @@ -53,7 +53,7 @@ inline void push_heap(RandomAccessRange& rng, Compare comp_pred) template inline void push_heap(const RandomAccessRange& rng, Compare comp_pred) { - BOOST_CONCEPT_ASSERT(( RandomAccessRangeConcept )); + BOOST_RANGE_CONCEPT_ASSERT(( RandomAccessRangeConcept )); std::push_heap(boost::begin(rng), boost::end(rng), comp_pred); } @@ -66,7 +66,7 @@ inline void push_heap(const RandomAccessRange& rng, Compare comp_pred) template inline void pop_heap(RandomAccessRange& rng) { - BOOST_CONCEPT_ASSERT(( RandomAccessRangeConcept )); + BOOST_RANGE_CONCEPT_ASSERT(( RandomAccessRangeConcept )); std::pop_heap(boost::begin(rng), boost::end(rng)); } @@ -74,7 +74,7 @@ inline void pop_heap(RandomAccessRange& rng) template inline void pop_heap(const RandomAccessRange& rng) { - BOOST_CONCEPT_ASSERT(( RandomAccessRangeConcept )); + BOOST_RANGE_CONCEPT_ASSERT(( RandomAccessRangeConcept )); std::pop_heap(boost::begin(rng),boost::end(rng)); } @@ -82,7 +82,7 @@ inline void pop_heap(const RandomAccessRange& rng) template inline void pop_heap(RandomAccessRange& rng, Compare comp_pred) { - BOOST_CONCEPT_ASSERT(( RandomAccessRangeConcept )); + BOOST_RANGE_CONCEPT_ASSERT(( RandomAccessRangeConcept )); std::pop_heap(boost::begin(rng), boost::end(rng), comp_pred); } @@ -90,7 +90,7 @@ inline void pop_heap(RandomAccessRange& rng, Compare comp_pred) template inline void pop_heap(const RandomAccessRange& rng, Compare comp_pred) { - BOOST_CONCEPT_ASSERT(( RandomAccessRangeConcept )); + BOOST_RANGE_CONCEPT_ASSERT(( RandomAccessRangeConcept )); std::pop_heap(boost::begin(rng), boost::end(rng), comp_pred); } @@ -103,7 +103,7 @@ inline void pop_heap(const RandomAccessRange& rng, Compare comp_pred) template inline void make_heap(RandomAccessRange& rng) { - BOOST_CONCEPT_ASSERT(( RandomAccessRangeConcept )); + BOOST_RANGE_CONCEPT_ASSERT(( RandomAccessRangeConcept )); std::make_heap(boost::begin(rng), boost::end(rng)); } @@ -111,7 +111,7 @@ inline void make_heap(RandomAccessRange& rng) template inline void make_heap(const RandomAccessRange& rng) { - BOOST_CONCEPT_ASSERT(( RandomAccessRangeConcept )); + BOOST_RANGE_CONCEPT_ASSERT(( RandomAccessRangeConcept )); std::make_heap(boost::begin(rng),boost::end(rng)); } @@ -119,7 +119,7 @@ inline void make_heap(const RandomAccessRange& rng) template inline void make_heap(RandomAccessRange& rng, Compare comp_pred) { - BOOST_CONCEPT_ASSERT(( RandomAccessRangeConcept )); + BOOST_RANGE_CONCEPT_ASSERT(( RandomAccessRangeConcept )); std::make_heap(boost::begin(rng), boost::end(rng), comp_pred); } @@ -127,7 +127,7 @@ inline void make_heap(RandomAccessRange& rng, Compare comp_pred) template inline void make_heap(const RandomAccessRange& rng, Compare comp_pred) { - BOOST_CONCEPT_ASSERT(( RandomAccessRangeConcept )); + BOOST_RANGE_CONCEPT_ASSERT(( RandomAccessRangeConcept )); std::make_heap(boost::begin(rng), boost::end(rng), comp_pred); } @@ -140,7 +140,7 @@ inline void make_heap(const RandomAccessRange& rng, Compare comp_pred) template inline void sort_heap(RandomAccessRange& rng) { - BOOST_CONCEPT_ASSERT(( RandomAccessRangeConcept )); + BOOST_RANGE_CONCEPT_ASSERT(( RandomAccessRangeConcept )); std::sort_heap(boost::begin(rng), boost::end(rng)); } @@ -148,7 +148,7 @@ inline void sort_heap(RandomAccessRange& rng) template inline void sort_heap(const RandomAccessRange& rng) { - BOOST_CONCEPT_ASSERT(( RandomAccessRangeConcept )); + BOOST_RANGE_CONCEPT_ASSERT(( RandomAccessRangeConcept )); std::sort_heap(boost::begin(rng), boost::end(rng)); } @@ -156,7 +156,7 @@ inline void sort_heap(const RandomAccessRange& rng) template inline void sort_heap(RandomAccessRange& rng, Compare comp_pred) { - BOOST_CONCEPT_ASSERT(( RandomAccessRangeConcept )); + BOOST_RANGE_CONCEPT_ASSERT(( RandomAccessRangeConcept )); std::sort_heap(boost::begin(rng), boost::end(rng), comp_pred); } @@ -164,7 +164,7 @@ inline void sort_heap(RandomAccessRange& rng, Compare comp_pred) template inline void sort_heap(const RandomAccessRange& rng, Compare comp_pred) { - BOOST_CONCEPT_ASSERT(( RandomAccessRangeConcept )); + BOOST_RANGE_CONCEPT_ASSERT(( RandomAccessRangeConcept )); std::sort_heap(boost::begin(rng), boost::end(rng), comp_pred); } diff --git a/include/boost/range/algorithm/inplace_merge.hpp b/include/boost/range/algorithm/inplace_merge.hpp index 867b70c..dfadbaa 100755 --- a/include/boost/range/algorithm/inplace_merge.hpp +++ b/include/boost/range/algorithm/inplace_merge.hpp @@ -30,7 +30,7 @@ template inline BidirectionalRange& inplace_merge(BidirectionalRange& rng, BOOST_DEDUCED_TYPENAME range_iterator::type middle) { - BOOST_CONCEPT_ASSERT(( BidirectionalRangeConcept )); + BOOST_RANGE_CONCEPT_ASSERT(( BidirectionalRangeConcept )); std::inplace_merge(boost::begin(rng), middle, boost::end(rng)); return rng; } @@ -40,7 +40,7 @@ template inline const BidirectionalRange& inplace_merge(const BidirectionalRange& rng, BOOST_DEDUCED_TYPENAME boost::range_iterator::type middle) { - BOOST_CONCEPT_ASSERT(( BidirectionalRangeConcept )); + BOOST_RANGE_CONCEPT_ASSERT(( BidirectionalRangeConcept )); std::inplace_merge(boost::begin(rng), middle, boost::end(rng)); return rng; } @@ -51,7 +51,7 @@ inline BidirectionalRange& inplace_merge(BidirectionalRange& rng, BOOST_DEDUCED_TYPENAME boost::range_iterator::type middle, BinaryPredicate pred) { - BOOST_CONCEPT_ASSERT(( BidirectionalRangeConcept )); + BOOST_RANGE_CONCEPT_ASSERT(( BidirectionalRangeConcept )); std::inplace_merge(boost::begin(rng), middle, boost::end(rng), pred); return rng; } @@ -62,7 +62,7 @@ inline const BidirectionalRange& inplace_merge(const BidirectionalRange& rng, BOOST_DEDUCED_TYPENAME boost::range_iterator::type middle, BinaryPredicate pred) { - BOOST_CONCEPT_ASSERT(( BidirectionalRangeConcept )); + BOOST_RANGE_CONCEPT_ASSERT(( BidirectionalRangeConcept )); std::inplace_merge(boost::begin(rng), middle, boost::end(rng), pred); return rng; } diff --git a/include/boost/range/algorithm/lexicographical_compare.hpp b/include/boost/range/algorithm/lexicographical_compare.hpp index 9c72526..c6e4bc8 100755 --- a/include/boost/range/algorithm/lexicographical_compare.hpp +++ b/include/boost/range/algorithm/lexicographical_compare.hpp @@ -30,8 +30,8 @@ template inline bool lexicographical_compare(const SinglePassRange1& rng1, const SinglePassRange2& rng2) { - BOOST_CONCEPT_ASSERT(( SinglePassRangeConcept )); - BOOST_CONCEPT_ASSERT(( SinglePassRangeConcept )); + BOOST_RANGE_CONCEPT_ASSERT(( SinglePassRangeConcept )); + BOOST_RANGE_CONCEPT_ASSERT(( SinglePassRangeConcept )); return std::lexicographical_compare( boost::begin(rng1), boost::end(rng1), boost::begin(rng2), boost::end(rng2)); @@ -44,8 +44,8 @@ inline bool lexicographical_compare(const SinglePassRange1& rng1, const SinglePassRange2& rng2, BinaryPredicate pred) { - BOOST_CONCEPT_ASSERT(( SinglePassRangeConcept )); - BOOST_CONCEPT_ASSERT(( SinglePassRangeConcept )); + BOOST_RANGE_CONCEPT_ASSERT(( SinglePassRangeConcept )); + BOOST_RANGE_CONCEPT_ASSERT(( SinglePassRangeConcept )); return std::lexicographical_compare( boost::begin(rng1), boost::end(rng1), boost::begin(rng2), boost::end(rng2), pred); diff --git a/include/boost/range/algorithm/lower_bound.hpp b/include/boost/range/algorithm/lower_bound.hpp index 8a954b3..5d3945e 100755 --- a/include/boost/range/algorithm/lower_bound.hpp +++ b/include/boost/range/algorithm/lower_bound.hpp @@ -30,7 +30,7 @@ template< class ForwardRange, class Value > inline BOOST_DEDUCED_TYPENAME range_iterator::type lower_bound( ForwardRange& rng, Value val ) { - BOOST_CONCEPT_ASSERT(( ForwardRangeConcept )); + BOOST_RANGE_CONCEPT_ASSERT(( ForwardRangeConcept )); return std::lower_bound(boost::begin(rng), boost::end(rng), val); } /// \overload @@ -38,7 +38,7 @@ template< class ForwardRange, class Value, class SortPredicate > inline BOOST_DEDUCED_TYPENAME range_iterator::type lower_bound( ForwardRange& rng, Value val, SortPredicate pred ) { - BOOST_CONCEPT_ASSERT(( ForwardRangeConcept )); + BOOST_RANGE_CONCEPT_ASSERT(( ForwardRangeConcept )); return std::lower_bound(boost::begin(rng), boost::end(rng), val, pred); } /// \overload @@ -46,7 +46,7 @@ template< range_return_value re, class ForwardRange, class Value > inline BOOST_DEDUCED_TYPENAME range_return::type lower_bound( ForwardRange& rng, Value val ) { - BOOST_CONCEPT_ASSERT(( ForwardRangeConcept )); + BOOST_RANGE_CONCEPT_ASSERT(( ForwardRangeConcept )); return range_return:: pack(std::lower_bound(boost::begin(rng), boost::end(rng), val), rng); @@ -56,7 +56,7 @@ template< range_return_value re, class ForwardRange, class Value, class SortPred inline BOOST_DEDUCED_TYPENAME range_return::type lower_bound( ForwardRange& rng, Value val, SortPredicate pred ) { - BOOST_CONCEPT_ASSERT(( ForwardRangeConcept )); + BOOST_RANGE_CONCEPT_ASSERT(( ForwardRangeConcept )); return range_return:: pack(std::lower_bound(boost::begin(rng), boost::end(rng), val, pred), rng); diff --git a/include/boost/range/algorithm/max_element.hpp b/include/boost/range/algorithm/max_element.hpp index 3e4df5f..a0c1ffd 100755 --- a/include/boost/range/algorithm/max_element.hpp +++ b/include/boost/range/algorithm/max_element.hpp @@ -31,7 +31,7 @@ template inline BOOST_DEDUCED_TYPENAME range_iterator::type max_element(ForwardRange& rng) { - BOOST_CONCEPT_ASSERT(( ForwardRangeConcept )); + BOOST_RANGE_CONCEPT_ASSERT(( ForwardRangeConcept )); return std::max_element(boost::begin(rng), boost::end(rng)); } @@ -40,7 +40,7 @@ template inline BOOST_DEDUCED_TYPENAME range_iterator::type max_element(const ForwardRange& rng) { - BOOST_CONCEPT_ASSERT(( ForwardRangeConcept )); + BOOST_RANGE_CONCEPT_ASSERT(( ForwardRangeConcept )); return std::max_element(boost::begin(rng), boost::end(rng)); } @@ -49,7 +49,7 @@ template inline BOOST_DEDUCED_TYPENAME range_iterator::type max_element(ForwardRange& rng, BinaryPredicate pred) { - BOOST_CONCEPT_ASSERT(( ForwardRangeConcept )); + BOOST_RANGE_CONCEPT_ASSERT(( ForwardRangeConcept )); return std::max_element(boost::begin(rng), boost::end(rng), pred); } @@ -58,7 +58,7 @@ template inline BOOST_DEDUCED_TYPENAME range_iterator::type max_element(const ForwardRange& rng, BinaryPredicate pred) { - BOOST_CONCEPT_ASSERT(( ForwardRangeConcept )); + BOOST_RANGE_CONCEPT_ASSERT(( ForwardRangeConcept )); return std::max_element(boost::begin(rng), boost::end(rng), pred); } @@ -69,7 +69,7 @@ template inline BOOST_DEDUCED_TYPENAME range_return::type max_element(ForwardRange& rng) { - BOOST_CONCEPT_ASSERT(( ForwardRangeConcept )); + BOOST_RANGE_CONCEPT_ASSERT(( ForwardRangeConcept )); return range_return::pack( std::max_element(boost::begin(rng), boost::end(rng)), rng); @@ -80,7 +80,7 @@ template inline BOOST_DEDUCED_TYPENAME range_return::type max_element(const ForwardRange& rng) { - BOOST_CONCEPT_ASSERT(( ForwardRangeConcept )); + BOOST_RANGE_CONCEPT_ASSERT(( ForwardRangeConcept )); return range_return::pack( std::max_element(boost::begin(rng), boost::end(rng)), rng); @@ -91,7 +91,7 @@ template inline BOOST_DEDUCED_TYPENAME range_return::type max_element(ForwardRange& rng, BinaryPredicate pred) { - BOOST_CONCEPT_ASSERT(( ForwardRangeConcept )); + BOOST_RANGE_CONCEPT_ASSERT(( ForwardRangeConcept )); return range_return::pack( std::max_element(boost::begin(rng), boost::end(rng), pred), rng); @@ -102,7 +102,7 @@ template inline BOOST_DEDUCED_TYPENAME range_return::type max_element(const ForwardRange& rng, BinaryPredicate pred) { - BOOST_CONCEPT_ASSERT(( ForwardRangeConcept )); + BOOST_RANGE_CONCEPT_ASSERT(( ForwardRangeConcept )); return range_return::pack( std::max_element(boost::begin(rng), boost::end(rng), pred), rng); diff --git a/include/boost/range/algorithm/merge.hpp b/include/boost/range/algorithm/merge.hpp index 7f6030c..c81b8c7 100755 --- a/include/boost/range/algorithm/merge.hpp +++ b/include/boost/range/algorithm/merge.hpp @@ -34,8 +34,8 @@ inline OutputIterator merge(const SinglePassRange1& rng1, const SinglePassRange2& rng2, OutputIterator out) { - BOOST_CONCEPT_ASSERT(( SinglePassRangeConcept )); - BOOST_CONCEPT_ASSERT(( SinglePassRangeConcept )); + BOOST_RANGE_CONCEPT_ASSERT(( SinglePassRangeConcept )); + BOOST_RANGE_CONCEPT_ASSERT(( SinglePassRangeConcept )); return std::merge(boost::begin(rng1), boost::end(rng1), boost::begin(rng2), boost::end(rng2), out); } @@ -48,8 +48,8 @@ inline OutputIterator merge(const SinglePassRange1& rng1, OutputIterator out, BinaryPredicate pred) { - BOOST_CONCEPT_ASSERT(( SinglePassRangeConcept )); - BOOST_CONCEPT_ASSERT(( SinglePassRangeConcept )); + BOOST_RANGE_CONCEPT_ASSERT(( SinglePassRangeConcept )); + BOOST_RANGE_CONCEPT_ASSERT(( SinglePassRangeConcept )); return std::merge(boost::begin(rng1), boost::end(rng1), boost::begin(rng2), boost::end(rng2), out, pred); } diff --git a/include/boost/range/algorithm/min_element.hpp b/include/boost/range/algorithm/min_element.hpp index 1fb0f24..c966b1e 100755 --- a/include/boost/range/algorithm/min_element.hpp +++ b/include/boost/range/algorithm/min_element.hpp @@ -31,7 +31,7 @@ template inline BOOST_DEDUCED_TYPENAME range_iterator::type min_element(ForwardRange& rng) { - BOOST_CONCEPT_ASSERT(( ForwardRangeConcept )); + BOOST_RANGE_CONCEPT_ASSERT(( ForwardRangeConcept )); return std::min_element(boost::begin(rng), boost::end(rng)); } @@ -40,7 +40,7 @@ template inline BOOST_DEDUCED_TYPENAME range_iterator::type min_element(const ForwardRange& rng) { - BOOST_CONCEPT_ASSERT(( ForwardRangeConcept )); + BOOST_RANGE_CONCEPT_ASSERT(( ForwardRangeConcept )); return std::min_element(boost::begin(rng), boost::end(rng)); } @@ -49,7 +49,7 @@ template inline BOOST_DEDUCED_TYPENAME range_iterator::type min_element(ForwardRange& rng, BinaryPredicate pred) { - BOOST_CONCEPT_ASSERT(( ForwardRangeConcept )); + BOOST_RANGE_CONCEPT_ASSERT(( ForwardRangeConcept )); return std::min_element(boost::begin(rng), boost::end(rng), pred); } @@ -58,7 +58,7 @@ template inline BOOST_DEDUCED_TYPENAME range_iterator::type min_element(const ForwardRange& rng, BinaryPredicate pred) { - BOOST_CONCEPT_ASSERT(( ForwardRangeConcept )); + BOOST_RANGE_CONCEPT_ASSERT(( ForwardRangeConcept )); return std::min_element(boost::begin(rng), boost::end(rng), pred); } @@ -69,7 +69,7 @@ template inline BOOST_DEDUCED_TYPENAME range_return::type min_element(ForwardRange& rng) { - BOOST_CONCEPT_ASSERT(( ForwardRangeConcept )); + BOOST_RANGE_CONCEPT_ASSERT(( ForwardRangeConcept )); return range_return::pack( std::min_element(boost::begin(rng), boost::end(rng)), rng); @@ -80,7 +80,7 @@ template inline BOOST_DEDUCED_TYPENAME range_return::type min_element(const ForwardRange& rng) { - BOOST_CONCEPT_ASSERT(( ForwardRangeConcept )); + BOOST_RANGE_CONCEPT_ASSERT(( ForwardRangeConcept )); return range_return::pack( std::min_element(boost::begin(rng), boost::end(rng)), rng); @@ -91,7 +91,7 @@ template inline BOOST_DEDUCED_TYPENAME range_return::type min_element(ForwardRange& rng, BinaryPredicate pred) { - BOOST_CONCEPT_ASSERT(( ForwardRangeConcept )); + BOOST_RANGE_CONCEPT_ASSERT(( ForwardRangeConcept )); return range_return::pack( std::min_element(boost::begin(rng), boost::end(rng), pred), rng); @@ -102,7 +102,7 @@ template inline BOOST_DEDUCED_TYPENAME range_return::type min_element(const ForwardRange& rng, BinaryPredicate pred) { - BOOST_CONCEPT_ASSERT(( ForwardRangeConcept )); + BOOST_RANGE_CONCEPT_ASSERT(( ForwardRangeConcept )); return range_return::pack( std::min_element(boost::begin(rng), boost::end(rng), pred), rng); diff --git a/include/boost/range/algorithm/mismatch.hpp b/include/boost/range/algorithm/mismatch.hpp index c1cfa87..2819c33 100755 --- a/include/boost/range/algorithm/mismatch.hpp +++ b/include/boost/range/algorithm/mismatch.hpp @@ -74,8 +74,8 @@ inline std::pair< BOOST_DEDUCED_TYPENAME range_iterator::type > mismatch(SinglePassRange1& rng1, const SinglePassRange2 & rng2) { - BOOST_CONCEPT_ASSERT(( SinglePassRangeConcept )); - BOOST_CONCEPT_ASSERT(( SinglePassRangeConcept )); + BOOST_RANGE_CONCEPT_ASSERT(( SinglePassRangeConcept )); + BOOST_RANGE_CONCEPT_ASSERT(( SinglePassRangeConcept )); return ::boost::range_detail::mismatch_impl( ::boost::begin(rng1), ::boost::end(rng1), @@ -89,8 +89,8 @@ inline std::pair< BOOST_DEDUCED_TYPENAME range_iterator::type > mismatch(const SinglePassRange1& rng1, const SinglePassRange2& rng2) { - BOOST_CONCEPT_ASSERT(( SinglePassRangeConcept )); - BOOST_CONCEPT_ASSERT(( SinglePassRangeConcept )); + BOOST_RANGE_CONCEPT_ASSERT(( SinglePassRangeConcept )); + BOOST_RANGE_CONCEPT_ASSERT(( SinglePassRangeConcept )); return ::boost::range_detail::mismatch_impl( ::boost::begin(rng1), ::boost::end(rng1), @@ -104,8 +104,8 @@ inline std::pair< BOOST_DEDUCED_TYPENAME range_iterator::type > mismatch(SinglePassRange1& rng1, SinglePassRange2 & rng2) { - BOOST_CONCEPT_ASSERT(( SinglePassRangeConcept )); - BOOST_CONCEPT_ASSERT(( SinglePassRangeConcept )); + BOOST_RANGE_CONCEPT_ASSERT(( SinglePassRangeConcept )); + BOOST_RANGE_CONCEPT_ASSERT(( SinglePassRangeConcept )); return ::boost::range_detail::mismatch_impl( ::boost::begin(rng1), ::boost::end(rng1), @@ -119,8 +119,8 @@ inline std::pair< BOOST_DEDUCED_TYPENAME range_iterator::type > mismatch(const SinglePassRange1& rng1, SinglePassRange2& rng2) { - BOOST_CONCEPT_ASSERT(( SinglePassRangeConcept )); - BOOST_CONCEPT_ASSERT(( SinglePassRangeConcept )); + BOOST_RANGE_CONCEPT_ASSERT(( SinglePassRangeConcept )); + BOOST_RANGE_CONCEPT_ASSERT(( SinglePassRangeConcept )); return ::boost::range_detail::mismatch_impl( ::boost::begin(rng1), ::boost::end(rng1), @@ -135,8 +135,8 @@ inline std::pair< BOOST_DEDUCED_TYPENAME range_iterator::type > mismatch(SinglePassRange1& rng1, const SinglePassRange2& rng2, BinaryPredicate pred) { - BOOST_CONCEPT_ASSERT(( SinglePassRangeConcept )); - BOOST_CONCEPT_ASSERT(( SinglePassRangeConcept )); + BOOST_RANGE_CONCEPT_ASSERT(( SinglePassRangeConcept )); + BOOST_RANGE_CONCEPT_ASSERT(( SinglePassRangeConcept )); return ::boost::range_detail::mismatch_impl( ::boost::begin(rng1), ::boost::end(rng1), @@ -150,8 +150,8 @@ inline std::pair< BOOST_DEDUCED_TYPENAME range_iterator::type > mismatch(const SinglePassRange1& rng1, const SinglePassRange2& rng2, BinaryPredicate pred) { - BOOST_CONCEPT_ASSERT(( SinglePassRangeConcept )); - BOOST_CONCEPT_ASSERT(( SinglePassRangeConcept )); + BOOST_RANGE_CONCEPT_ASSERT(( SinglePassRangeConcept )); + BOOST_RANGE_CONCEPT_ASSERT(( SinglePassRangeConcept )); return ::boost::range_detail::mismatch_impl( ::boost::begin(rng1), ::boost::end(rng1), @@ -165,8 +165,8 @@ inline std::pair< BOOST_DEDUCED_TYPENAME range_iterator::type > mismatch(SinglePassRange1& rng1, SinglePassRange2& rng2, BinaryPredicate pred) { - BOOST_CONCEPT_ASSERT(( SinglePassRangeConcept )); - BOOST_CONCEPT_ASSERT(( SinglePassRangeConcept )); + BOOST_RANGE_CONCEPT_ASSERT(( SinglePassRangeConcept )); + BOOST_RANGE_CONCEPT_ASSERT(( SinglePassRangeConcept )); return ::boost::range_detail::mismatch_impl( ::boost::begin(rng1), ::boost::end(rng1), @@ -180,8 +180,8 @@ inline std::pair< BOOST_DEDUCED_TYPENAME range_iterator::type > mismatch(const SinglePassRange1& rng1, SinglePassRange2& rng2, BinaryPredicate pred) { - BOOST_CONCEPT_ASSERT(( SinglePassRangeConcept )); - BOOST_CONCEPT_ASSERT(( SinglePassRangeConcept )); + BOOST_RANGE_CONCEPT_ASSERT(( SinglePassRangeConcept )); + BOOST_RANGE_CONCEPT_ASSERT(( SinglePassRangeConcept )); return ::boost::range_detail::mismatch_impl( ::boost::begin(rng1), ::boost::end(rng1), diff --git a/include/boost/range/algorithm/nth_element.hpp b/include/boost/range/algorithm/nth_element.hpp index 431aa23..3e06baf 100755 --- a/include/boost/range/algorithm/nth_element.hpp +++ b/include/boost/range/algorithm/nth_element.hpp @@ -30,7 +30,7 @@ template inline void nth_element(RandomAccessRange& rng, BOOST_DEDUCED_TYPENAME range_iterator::type nth) { - BOOST_CONCEPT_ASSERT(( RandomAccessRangeConcept )); + BOOST_RANGE_CONCEPT_ASSERT(( RandomAccessRangeConcept )); std::nth_element(boost::begin(rng), nth, boost::end(rng)); } @@ -39,7 +39,7 @@ template inline void nth_element(const RandomAccessRange& rng, BOOST_DEDUCED_TYPENAME range_iterator::type nth) { - BOOST_CONCEPT_ASSERT(( RandomAccessRangeConcept )); + BOOST_RANGE_CONCEPT_ASSERT(( RandomAccessRangeConcept )); std::nth_element(boost::begin(rng),nth,boost::end(rng)); } @@ -49,7 +49,7 @@ inline void nth_element(RandomAccessRange& rng, BOOST_DEDUCED_TYPENAME range_iterator::type nth, BinaryPredicate sort_pred) { - BOOST_CONCEPT_ASSERT(( RandomAccessRangeConcept )); + BOOST_RANGE_CONCEPT_ASSERT(( RandomAccessRangeConcept )); std::nth_element(boost::begin(rng), nth, boost::end(rng), sort_pred); } @@ -59,7 +59,7 @@ inline void nth_element(const RandomAccessRange& rng, BOOST_DEDUCED_TYPENAME range_iterator::type nth, BinaryPredicate sort_pred) { - BOOST_CONCEPT_ASSERT(( RandomAccessRangeConcept )); + BOOST_RANGE_CONCEPT_ASSERT(( RandomAccessRangeConcept )); std::nth_element(boost::begin(rng),nth,boost::end(rng), sort_pred); } diff --git a/include/boost/range/algorithm/partial_sort.hpp b/include/boost/range/algorithm/partial_sort.hpp index 2881bd4..e38c4be 100755 --- a/include/boost/range/algorithm/partial_sort.hpp +++ b/include/boost/range/algorithm/partial_sort.hpp @@ -30,7 +30,7 @@ template inline void partial_sort(RandomAccessRange& rng, BOOST_DEDUCED_TYPENAME range_iterator::type middle) { - BOOST_CONCEPT_ASSERT(( RandomAccessRangeConcept )); + BOOST_RANGE_CONCEPT_ASSERT(( RandomAccessRangeConcept )); std::partial_sort(boost::begin(rng), middle, boost::end(rng)); } @@ -39,7 +39,7 @@ template inline void partial_sort(const RandomAccessRange& rng, BOOST_DEDUCED_TYPENAME range_iterator::type middle) { - BOOST_CONCEPT_ASSERT(( RandomAccessRangeConcept )); + BOOST_RANGE_CONCEPT_ASSERT(( RandomAccessRangeConcept )); std::partial_sort(boost::begin(rng), middle, boost::end(rng)); } @@ -49,7 +49,7 @@ inline void partial_sort(RandomAccessRange& rng, BOOST_DEDUCED_TYPENAME range_iterator::type middle, BinaryPredicate sort_pred) { - BOOST_CONCEPT_ASSERT(( RandomAccessRangeConcept )); + BOOST_RANGE_CONCEPT_ASSERT(( RandomAccessRangeConcept )); std::partial_sort(boost::begin(rng), middle, boost::end(rng), sort_pred); } @@ -60,7 +60,7 @@ inline void partial_sort(const RandomAccessRange& rng, BOOST_DEDUCED_TYPENAME range_iterator::type middle, BinaryPredicate sort_pred) { - BOOST_CONCEPT_ASSERT(( RandomAccessRangeConcept )); + BOOST_RANGE_CONCEPT_ASSERT(( RandomAccessRangeConcept )); std::partial_sort(boost::begin(rng), middle, boost::end(rng), sort_pred); } diff --git a/include/boost/range/algorithm/partial_sort_copy.hpp b/include/boost/range/algorithm/partial_sort_copy.hpp index d95cf27..8cf3510 100755 --- a/include/boost/range/algorithm/partial_sort_copy.hpp +++ b/include/boost/range/algorithm/partial_sort_copy.hpp @@ -32,10 +32,10 @@ template inline typename range_iterator::type partial_sort_copy(const SinglePassRange& rng1, RandomAccessRange& rng2) { - BOOST_CONCEPT_ASSERT((SinglePassRangeConcept)); - BOOST_CONCEPT_ASSERT((WriteableRandomAccessRangeConcept)); - BOOST_CONCEPT_ASSERT((range_detail::SameTypeConcept::type, typename range_value::type>)); - BOOST_CONCEPT_ASSERT((LessThanComparableConcept::type>)); + BOOST_RANGE_CONCEPT_ASSERT((SinglePassRangeConcept)); + BOOST_RANGE_CONCEPT_ASSERT((WriteableRandomAccessRangeConcept)); + BOOST_RANGE_CONCEPT_ASSERT((range_detail::SameTypeConcept::type, typename range_value::type>)); + BOOST_RANGE_CONCEPT_ASSERT((LessThanComparableConcept::type>)); return std::partial_sort_copy(boost::begin(rng1), boost::end(rng1), boost::begin(rng2), boost::end(rng2)); @@ -48,10 +48,10 @@ inline typename range_iterator::type partial_sort_copy(const SinglePassRange& rng1, RandomAccessRange& rng2, BinaryPredicate pred) { - BOOST_CONCEPT_ASSERT((SinglePassRangeConcept)); - BOOST_CONCEPT_ASSERT((WriteableRandomAccessRangeConcept)); - BOOST_CONCEPT_ASSERT((range_detail::SameTypeConcept::type, typename range_value::type>)); - BOOST_CONCEPT_ASSERT((BinaryPredicateConcept::type, typename range_value::type>)); + BOOST_RANGE_CONCEPT_ASSERT((SinglePassRangeConcept)); + BOOST_RANGE_CONCEPT_ASSERT((WriteableRandomAccessRangeConcept)); + BOOST_RANGE_CONCEPT_ASSERT((range_detail::SameTypeConcept::type, typename range_value::type>)); + BOOST_RANGE_CONCEPT_ASSERT((BinaryPredicateConcept::type, typename range_value::type>)); return std::partial_sort_copy(boost::begin(rng1), boost::end(rng1), boost::begin(rng2), boost::end(rng2), pred); diff --git a/include/boost/range/algorithm/partition.hpp b/include/boost/range/algorithm/partition.hpp index f7dfbbb..05f41da 100755 --- a/include/boost/range/algorithm/partition.hpp +++ b/include/boost/range/algorithm/partition.hpp @@ -30,7 +30,7 @@ template inline BOOST_DEDUCED_TYPENAME range_iterator::type partition(ForwardRange& rng, UnaryPredicate pred) { - BOOST_CONCEPT_ASSERT(( ForwardRangeConcept )); + BOOST_RANGE_CONCEPT_ASSERT(( ForwardRangeConcept )); return std::partition(boost::begin(rng),boost::end(rng),pred); } @@ -39,7 +39,7 @@ template inline BOOST_DEDUCED_TYPENAME range_iterator::type partition(const ForwardRange& rng, UnaryPredicate pred) { - BOOST_CONCEPT_ASSERT(( ForwardRangeConcept )); + BOOST_RANGE_CONCEPT_ASSERT(( ForwardRangeConcept )); return std::partition(boost::begin(rng),boost::end(rng),pred); } @@ -51,7 +51,7 @@ template< range_return_value re, class ForwardRange, inline BOOST_DEDUCED_TYPENAME range_return::type partition(ForwardRange& rng, UnaryPredicate pred) { - BOOST_CONCEPT_ASSERT(( ForwardRangeConcept )); + BOOST_RANGE_CONCEPT_ASSERT(( ForwardRangeConcept )); return boost::range_return:: pack(std::partition(boost::begin(rng), boost::end(rng), pred), rng); } @@ -62,7 +62,7 @@ template< range_return_value re, class ForwardRange, inline BOOST_DEDUCED_TYPENAME range_return::type partition(const ForwardRange& rng, UnaryPredicate pred) { - BOOST_CONCEPT_ASSERT(( ForwardRangeConcept )); + BOOST_RANGE_CONCEPT_ASSERT(( ForwardRangeConcept )); return boost::range_return:: pack(std::partition(boost::begin(rng), boost::end(rng), pred), rng); } diff --git a/include/boost/range/algorithm/permutation.hpp b/include/boost/range/algorithm/permutation.hpp index 6a80ef8..75388cc 100755 --- a/include/boost/range/algorithm/permutation.hpp +++ b/include/boost/range/algorithm/permutation.hpp @@ -29,7 +29,7 @@ namespace boost template inline bool next_permutation(BidirectionalRange& rng) { - BOOST_CONCEPT_ASSERT(( BidirectionalRangeConcept )); + BOOST_RANGE_CONCEPT_ASSERT(( BidirectionalRangeConcept )); return std::next_permutation(boost::begin(rng), boost::end(rng)); } @@ -37,7 +37,7 @@ inline bool next_permutation(BidirectionalRange& rng) template inline bool next_permutation(const BidirectionalRange& rng) { - BOOST_CONCEPT_ASSERT(( BidirectionalRangeConcept )); + BOOST_RANGE_CONCEPT_ASSERT(( BidirectionalRangeConcept )); return std::next_permutation(boost::begin(rng), boost::end(rng)); } @@ -45,7 +45,7 @@ inline bool next_permutation(const BidirectionalRange& rng) template inline bool next_permutation(BidirectionalRange& rng, Compare comp_pred) { - BOOST_CONCEPT_ASSERT(( BidirectionalRangeConcept )); + BOOST_RANGE_CONCEPT_ASSERT(( BidirectionalRangeConcept )); return std::next_permutation(boost::begin(rng), boost::end(rng), comp_pred); } @@ -55,7 +55,7 @@ template inline bool next_permutation(const BidirectionalRange& rng, Compare comp_pred) { - BOOST_CONCEPT_ASSERT(( BidirectionalRangeConcept )); + BOOST_RANGE_CONCEPT_ASSERT(( BidirectionalRangeConcept )); return std::next_permutation(boost::begin(rng), boost::end(rng), comp_pred); } @@ -69,7 +69,7 @@ inline bool next_permutation(const BidirectionalRange& rng, template inline bool prev_permutation(BidirectionalRange& rng) { - BOOST_CONCEPT_ASSERT(( BidirectionalRangeConcept )); + BOOST_RANGE_CONCEPT_ASSERT(( BidirectionalRangeConcept )); return std::prev_permutation(boost::begin(rng), boost::end(rng)); } @@ -77,7 +77,7 @@ inline bool prev_permutation(BidirectionalRange& rng) template inline bool prev_permutation(const BidirectionalRange& rng) { - BOOST_CONCEPT_ASSERT(( BidirectionalRangeConcept )); + BOOST_RANGE_CONCEPT_ASSERT(( BidirectionalRangeConcept )); return std::prev_permutation(boost::begin(rng), boost::end(rng)); } @@ -85,7 +85,7 @@ inline bool prev_permutation(const BidirectionalRange& rng) template inline bool prev_permutation(BidirectionalRange& rng, Compare comp_pred) { - BOOST_CONCEPT_ASSERT(( BidirectionalRangeConcept )); + BOOST_RANGE_CONCEPT_ASSERT(( BidirectionalRangeConcept )); return std::prev_permutation(boost::begin(rng), boost::end(rng), comp_pred); } @@ -95,7 +95,7 @@ template inline bool prev_permutation(const BidirectionalRange& rng, Compare comp_pred) { - BOOST_CONCEPT_ASSERT(( BidirectionalRangeConcept )); + BOOST_RANGE_CONCEPT_ASSERT(( BidirectionalRangeConcept )); return std::prev_permutation(boost::begin(rng), boost::end(rng), comp_pred); } diff --git a/include/boost/range/algorithm/random_shuffle.hpp b/include/boost/range/algorithm/random_shuffle.hpp index b90bdd1..eeae3d7 100755 --- a/include/boost/range/algorithm/random_shuffle.hpp +++ b/include/boost/range/algorithm/random_shuffle.hpp @@ -29,7 +29,7 @@ namespace boost template inline RandomAccessRange& random_shuffle(RandomAccessRange& rng) { - BOOST_CONCEPT_ASSERT(( RandomAccessRangeConcept )); + BOOST_RANGE_CONCEPT_ASSERT(( RandomAccessRangeConcept )); std::random_shuffle(boost::begin(rng), boost::end(rng)); return rng; } @@ -38,7 +38,7 @@ inline RandomAccessRange& random_shuffle(RandomAccessRange& rng) template inline const RandomAccessRange& random_shuffle(const RandomAccessRange& rng) { - BOOST_CONCEPT_ASSERT(( RandomAccessRangeConcept )); + BOOST_RANGE_CONCEPT_ASSERT(( RandomAccessRangeConcept )); std::random_shuffle(boost::begin(rng),boost::end(rng)); return rng; } @@ -47,7 +47,7 @@ inline const RandomAccessRange& random_shuffle(const RandomAccessRange& rng) template inline RandomAccessRange& random_shuffle(RandomAccessRange& rng, Generator& gen) { - BOOST_CONCEPT_ASSERT(( RandomAccessRangeConcept )); + BOOST_RANGE_CONCEPT_ASSERT(( RandomAccessRangeConcept )); std::random_shuffle(boost::begin(rng), boost::end(rng), gen); return rng; } @@ -56,7 +56,7 @@ inline RandomAccessRange& random_shuffle(RandomAccessRange& rng, Generator& gen) template inline const RandomAccessRange& random_shuffle(const RandomAccessRange& rng, Generator& gen) { - BOOST_CONCEPT_ASSERT(( RandomAccessRangeConcept )); + BOOST_RANGE_CONCEPT_ASSERT(( RandomAccessRangeConcept )); std::random_shuffle(boost::begin(rng), boost::end(rng), gen); return rng; } diff --git a/include/boost/range/algorithm/remove.hpp b/include/boost/range/algorithm/remove.hpp index ed4dad0..699a7cd 100755 --- a/include/boost/range/algorithm/remove.hpp +++ b/include/boost/range/algorithm/remove.hpp @@ -30,7 +30,7 @@ template< class ForwardRange, class Value > inline BOOST_DEDUCED_TYPENAME range_iterator::type remove(ForwardRange& rng, const Value& val) { - BOOST_CONCEPT_ASSERT(( ForwardRangeConcept )); + BOOST_RANGE_CONCEPT_ASSERT(( ForwardRangeConcept )); return std::remove(boost::begin(rng),boost::end(rng),val); } @@ -39,7 +39,7 @@ template< class ForwardRange, class Value > inline BOOST_DEDUCED_TYPENAME range_iterator::type remove(const ForwardRange& rng, const Value& val) { - BOOST_CONCEPT_ASSERT(( ForwardRangeConcept )); + BOOST_RANGE_CONCEPT_ASSERT(( ForwardRangeConcept )); return std::remove(boost::begin(rng),boost::end(rng),val); } @@ -50,7 +50,7 @@ template< range_return_value re, class ForwardRange, class Value > inline BOOST_DEDUCED_TYPENAME range_return::type remove(ForwardRange& rng, const Value& val) { - BOOST_CONCEPT_ASSERT(( ForwardRangeConcept )); + BOOST_RANGE_CONCEPT_ASSERT(( ForwardRangeConcept )); return range_return::pack( std::remove(boost::begin(rng), boost::end(rng), val), rng); @@ -61,7 +61,7 @@ template< range_return_value re, class ForwardRange, class Value > inline BOOST_DEDUCED_TYPENAME range_return::type remove(const ForwardRange& rng, const Value& val) { - BOOST_CONCEPT_ASSERT(( ForwardRangeConcept )); + BOOST_RANGE_CONCEPT_ASSERT(( ForwardRangeConcept )); return range_return::pack( std::remove(boost::begin(rng), boost::end(rng), val), rng); diff --git a/include/boost/range/algorithm/remove_copy.hpp b/include/boost/range/algorithm/remove_copy.hpp index 1568240..0d3d83d 100755 --- a/include/boost/range/algorithm/remove_copy.hpp +++ b/include/boost/range/algorithm/remove_copy.hpp @@ -33,7 +33,7 @@ template< class SinglePassRange, class OutputIterator, class Value > inline OutputIterator remove_copy(SinglePassRange& rng, OutputIterator out_it, const Value& val) { - BOOST_CONCEPT_ASSERT(( SinglePassRangeConcept )); + BOOST_RANGE_CONCEPT_ASSERT(( SinglePassRangeConcept )); return std::remove_copy(boost::begin(rng), boost::end(rng), out_it, val); } diff --git a/include/boost/range/algorithm/remove_if.hpp b/include/boost/range/algorithm/remove_if.hpp index 5a51d13..babcddc 100755 --- a/include/boost/range/algorithm/remove_if.hpp +++ b/include/boost/range/algorithm/remove_if.hpp @@ -31,7 +31,7 @@ template< class ForwardRange, class UnaryPredicate > inline BOOST_DEDUCED_TYPENAME boost::range_iterator::type remove_if(ForwardRange& rng, UnaryPredicate pred) { - BOOST_CONCEPT_ASSERT(( ForwardRangeConcept )); + BOOST_RANGE_CONCEPT_ASSERT(( ForwardRangeConcept )); return std::remove_if(boost::begin(rng), boost::end(rng), pred); } @@ -40,7 +40,7 @@ template< class ForwardRange, class UnaryPredicate > inline BOOST_DEDUCED_TYPENAME boost::range_iterator::type remove_if(const ForwardRange& rng, UnaryPredicate pred) { - BOOST_CONCEPT_ASSERT(( ForwardRangeConcept )); + BOOST_RANGE_CONCEPT_ASSERT(( ForwardRangeConcept )); return std::remove_if(boost::begin(rng),boost::end(rng),pred); } @@ -51,7 +51,7 @@ template< range_return_value re, class ForwardRange, class UnaryPredicate > inline BOOST_DEDUCED_TYPENAME range_return::type remove_if(ForwardRange& rng, UnaryPredicate pred) { - BOOST_CONCEPT_ASSERT(( ForwardRangeConcept )); + BOOST_RANGE_CONCEPT_ASSERT(( ForwardRangeConcept )); return range_return::pack( std::remove_if(boost::begin(rng), boost::end(rng), pred), rng); @@ -62,7 +62,7 @@ template< range_return_value re, class ForwardRange, class UnaryPredicate > inline BOOST_DEDUCED_TYPENAME range_return::type remove_if(const ForwardRange& rng, UnaryPredicate pred) { - BOOST_CONCEPT_ASSERT(( ForwardRangeConcept )); + BOOST_RANGE_CONCEPT_ASSERT(( ForwardRangeConcept )); return range_return::pack( std::remove_if(boost::begin(rng), boost::end(rng), pred), rng); diff --git a/include/boost/range/algorithm/replace.hpp b/include/boost/range/algorithm/replace.hpp index 2d1d537..44d3e4c 100755 --- a/include/boost/range/algorithm/replace.hpp +++ b/include/boost/range/algorithm/replace.hpp @@ -30,7 +30,7 @@ inline ForwardRange& replace(ForwardRange& rng, const Value& what, const Value& with_what) { - BOOST_CONCEPT_ASSERT(( ForwardRangeConcept )); + BOOST_RANGE_CONCEPT_ASSERT(( ForwardRangeConcept )); std::replace(boost::begin(rng), boost::end(rng), what, with_what); return rng; } @@ -41,7 +41,7 @@ inline const ForwardRange& replace(const ForwardRange& rng, const Value& what, const Value& with_what) { - BOOST_CONCEPT_ASSERT(( ForwardRangeConcept )); + BOOST_RANGE_CONCEPT_ASSERT(( ForwardRangeConcept )); std::replace(boost::begin(rng), boost::end(rng), what, with_what); return rng; } diff --git a/include/boost/range/algorithm/replace_copy.hpp b/include/boost/range/algorithm/replace_copy.hpp index cfdd2d5..36c91ce 100755 --- a/include/boost/range/algorithm/replace_copy.hpp +++ b/include/boost/range/algorithm/replace_copy.hpp @@ -30,7 +30,7 @@ inline OutputIterator replace_copy(ForwardRange& rng, OutputIterator out_it, const Value& what, const Value& with_what) { - BOOST_CONCEPT_ASSERT(( ForwardRangeConcept )); + BOOST_RANGE_CONCEPT_ASSERT(( ForwardRangeConcept )); return std::replace_copy(boost::begin(rng), boost::end(rng), out_it, what, with_what); } diff --git a/include/boost/range/algorithm/replace_copy_if.hpp b/include/boost/range/algorithm/replace_copy_if.hpp index ba34e38..5d4bfb6 100755 --- a/include/boost/range/algorithm/replace_copy_if.hpp +++ b/include/boost/range/algorithm/replace_copy_if.hpp @@ -34,7 +34,7 @@ inline OutputIterator replace_copy_if(ForwardRange& rng, OutputIterator out_it, Predicate pred, const Value& with_what) { - BOOST_CONCEPT_ASSERT(( ForwardRangeConcept )); + BOOST_RANGE_CONCEPT_ASSERT(( ForwardRangeConcept )); return std::replace_copy_if(boost::begin(rng), boost::end(rng), out_it, pred, with_what); } diff --git a/include/boost/range/algorithm/replace_if.hpp b/include/boost/range/algorithm/replace_if.hpp index 211e895..93d5a1f 100755 --- a/include/boost/range/algorithm/replace_if.hpp +++ b/include/boost/range/algorithm/replace_if.hpp @@ -31,7 +31,7 @@ inline ForwardRange& replace_if(ForwardRange& rng, UnaryPredicate pred, const Value& val) { - BOOST_CONCEPT_ASSERT(( ForwardRangeConcept )); + BOOST_RANGE_CONCEPT_ASSERT(( ForwardRangeConcept )); std::replace_if(boost::begin(rng), boost::end(rng), pred, val); return rng; } @@ -42,7 +42,7 @@ inline const ForwardRange& replace_if(const ForwardRange& rng, UnaryPredicate pred, const Value& val) { - BOOST_CONCEPT_ASSERT(( ForwardRangeConcept )); + BOOST_RANGE_CONCEPT_ASSERT(( ForwardRangeConcept )); std::replace_if(boost::begin(rng), boost::end(rng), pred, val); return rng; } diff --git a/include/boost/range/algorithm/reverse.hpp b/include/boost/range/algorithm/reverse.hpp index bc6d960..20a7eb1 100755 --- a/include/boost/range/algorithm/reverse.hpp +++ b/include/boost/range/algorithm/reverse.hpp @@ -29,7 +29,7 @@ namespace boost template inline BidirectionalRange& reverse(BidirectionalRange& rng) { - BOOST_CONCEPT_ASSERT(( BidirectionalRangeConcept )); + BOOST_RANGE_CONCEPT_ASSERT(( BidirectionalRangeConcept )); std::reverse(boost::begin(rng), boost::end(rng)); return rng; } @@ -38,7 +38,7 @@ inline BidirectionalRange& reverse(BidirectionalRange& rng) template inline const BidirectionalRange& reverse(const BidirectionalRange& rng) { - BOOST_CONCEPT_ASSERT(( BidirectionalRangeConcept )); + BOOST_RANGE_CONCEPT_ASSERT(( BidirectionalRangeConcept )); std::reverse(boost::begin(rng), boost::end(rng)); return rng; } diff --git a/include/boost/range/algorithm/reverse_copy.hpp b/include/boost/range/algorithm/reverse_copy.hpp index 47b1337..381f157 100755 --- a/include/boost/range/algorithm/reverse_copy.hpp +++ b/include/boost/range/algorithm/reverse_copy.hpp @@ -29,7 +29,7 @@ namespace boost template inline OutputIterator reverse_copy(BidirectionalRange& rng, OutputIterator out) { - BOOST_CONCEPT_ASSERT(( BidirectionalRangeConcept )); + BOOST_RANGE_CONCEPT_ASSERT(( BidirectionalRangeConcept )); return std::reverse_copy(boost::begin(rng), boost::end(rng), out); } @@ -37,7 +37,7 @@ inline OutputIterator reverse_copy(BidirectionalRange& rng, OutputIterator out) template inline OutputIterator reverse_copy(const BidirectionalRange& rng, OutputIterator out) { - BOOST_CONCEPT_ASSERT(( BidirectionalRangeConcept )); + BOOST_RANGE_CONCEPT_ASSERT(( BidirectionalRangeConcept )); return std::reverse_copy(boost::begin(rng), boost::end(rng), out); } diff --git a/include/boost/range/algorithm/rotate.hpp b/include/boost/range/algorithm/rotate.hpp index 8e6c377..2372a00 100755 --- a/include/boost/range/algorithm/rotate.hpp +++ b/include/boost/range/algorithm/rotate.hpp @@ -29,7 +29,7 @@ template inline ForwardRange& rotate(ForwardRange& rng, typename range_iterator::type middle) { - BOOST_CONCEPT_ASSERT(( ForwardRangeConcept )); + BOOST_RANGE_CONCEPT_ASSERT(( ForwardRangeConcept )); std::rotate(boost::begin(rng), middle, boost::end(rng)); return rng; } @@ -40,7 +40,7 @@ inline const ForwardRange& rotate(const ForwardRange& rng, typename range_iterator::type middle) { - BOOST_CONCEPT_ASSERT(( ForwardRangeConcept )); + BOOST_RANGE_CONCEPT_ASSERT(( ForwardRangeConcept )); std::rotate(boost::begin(rng), middle, boost::end(rng)); return rng; } diff --git a/include/boost/range/algorithm/rotate_copy.hpp b/include/boost/range/algorithm/rotate_copy.hpp index 6751101..9030f73 100755 --- a/include/boost/range/algorithm/rotate_copy.hpp +++ b/include/boost/range/algorithm/rotate_copy.hpp @@ -33,7 +33,7 @@ namespace boost OutputIterator target ) { - BOOST_CONCEPT_ASSERT(( ForwardRangeConcept )); + BOOST_RANGE_CONCEPT_ASSERT(( ForwardRangeConcept )); return std::rotate_copy(boost::begin(rng), middle, boost::end(rng), target); } diff --git a/include/boost/range/algorithm/search.hpp b/include/boost/range/algorithm/search.hpp index 70526ad..45d7ade 100755 --- a/include/boost/range/algorithm/search.hpp +++ b/include/boost/range/algorithm/search.hpp @@ -32,8 +32,8 @@ template< class ForwardRange1, class ForwardRange2 > inline BOOST_DEDUCED_TYPENAME range_iterator::type search(ForwardRange1& rng1, const ForwardRange2& rng2) { - BOOST_CONCEPT_ASSERT(( ForwardRangeConcept )); - BOOST_CONCEPT_ASSERT(( ForwardRangeConcept )); + BOOST_RANGE_CONCEPT_ASSERT(( ForwardRangeConcept )); + BOOST_RANGE_CONCEPT_ASSERT(( ForwardRangeConcept )); return std::search(boost::begin(rng1),boost::end(rng1), boost::begin(rng2),boost::end(rng2)); } @@ -43,8 +43,8 @@ template< class ForwardRange1, class ForwardRange2 > inline BOOST_DEDUCED_TYPENAME range_iterator::type search(const ForwardRange1& rng1, const ForwardRange2& rng2) { - BOOST_CONCEPT_ASSERT(( ForwardRangeConcept )); - BOOST_CONCEPT_ASSERT(( ForwardRangeConcept )); + BOOST_RANGE_CONCEPT_ASSERT(( ForwardRangeConcept )); + BOOST_RANGE_CONCEPT_ASSERT(( ForwardRangeConcept )); return std::search(boost::begin(rng1),boost::end(rng1), boost::begin(rng2),boost::end(rng2)); } @@ -54,8 +54,8 @@ template< class ForwardRange1, class ForwardRange2, class BinaryPredicate > inline BOOST_DEDUCED_TYPENAME range_iterator::type search(ForwardRange1& rng1, const ForwardRange2& rng2, BinaryPredicate pred) { - BOOST_CONCEPT_ASSERT(( ForwardRangeConcept )); - BOOST_CONCEPT_ASSERT(( ForwardRangeConcept )); + BOOST_RANGE_CONCEPT_ASSERT(( ForwardRangeConcept )); + BOOST_RANGE_CONCEPT_ASSERT(( ForwardRangeConcept )); return std::search(boost::begin(rng1),boost::end(rng1), boost::begin(rng2),boost::end(rng2),pred); } @@ -66,8 +66,8 @@ inline BOOST_DEDUCED_TYPENAME range_iterator::type search(const ForwardRange1& rng1, const ForwardRange2& rng2, BinaryPredicate pred) { - BOOST_CONCEPT_ASSERT(( ForwardRangeConcept )); - BOOST_CONCEPT_ASSERT(( ForwardRangeConcept )); + BOOST_RANGE_CONCEPT_ASSERT(( ForwardRangeConcept )); + BOOST_RANGE_CONCEPT_ASSERT(( ForwardRangeConcept )); return std::search(boost::begin(rng1),boost::end(rng1), boost::begin(rng2),boost::end(rng2),pred); } @@ -79,8 +79,8 @@ template< range_return_value re, class ForwardRange1, class ForwardRange2 > inline BOOST_DEDUCED_TYPENAME range_return::type search(ForwardRange1& rng1, const ForwardRange2& rng2) { - BOOST_CONCEPT_ASSERT(( ForwardRangeConcept )); - BOOST_CONCEPT_ASSERT(( ForwardRangeConcept )); + BOOST_RANGE_CONCEPT_ASSERT(( ForwardRangeConcept )); + BOOST_RANGE_CONCEPT_ASSERT(( ForwardRangeConcept )); return range_return:: pack(std::search(boost::begin(rng1),boost::end(rng1), boost::begin(rng2),boost::end(rng2)), @@ -92,8 +92,8 @@ template< range_return_value re, class ForwardRange1, class ForwardRange2 > inline BOOST_DEDUCED_TYPENAME range_return::type search(const ForwardRange1& rng1, const ForwardRange2& rng2) { - BOOST_CONCEPT_ASSERT(( ForwardRangeConcept )); - BOOST_CONCEPT_ASSERT(( ForwardRangeConcept )); + BOOST_RANGE_CONCEPT_ASSERT(( ForwardRangeConcept )); + BOOST_RANGE_CONCEPT_ASSERT(( ForwardRangeConcept )); return range_return:: pack(std::search(boost::begin(rng1),boost::end(rng1), boost::begin(rng2),boost::end(rng2)), @@ -106,8 +106,8 @@ template< range_return_value re, class ForwardRange1, class ForwardRange2, inline BOOST_DEDUCED_TYPENAME range_return::type search(ForwardRange1& rng1, const ForwardRange2& rng2, BinaryPredicate pred) { - BOOST_CONCEPT_ASSERT(( ForwardRangeConcept )); - BOOST_CONCEPT_ASSERT(( ForwardRangeConcept )); + BOOST_RANGE_CONCEPT_ASSERT(( ForwardRangeConcept )); + BOOST_RANGE_CONCEPT_ASSERT(( ForwardRangeConcept )); return range_return:: pack(std::search(boost::begin(rng1),boost::end(rng1), boost::begin(rng2),boost::end(rng2),pred), @@ -121,8 +121,8 @@ inline BOOST_DEDUCED_TYPENAME range_return::type search(const ForwardRange1& rng1, const ForwardRange2& rng2, BinaryPredicate pred) { - BOOST_CONCEPT_ASSERT(( ForwardRangeConcept )); - BOOST_CONCEPT_ASSERT(( ForwardRangeConcept )); + BOOST_RANGE_CONCEPT_ASSERT(( ForwardRangeConcept )); + BOOST_RANGE_CONCEPT_ASSERT(( ForwardRangeConcept )); return range_return:: pack(std::search(boost::begin(rng1),boost::end(rng1), boost::begin(rng2),boost::end(rng2),pred), diff --git a/include/boost/range/algorithm/search_n.hpp b/include/boost/range/algorithm/search_n.hpp index d7b84ae..cd0340b 100755 --- a/include/boost/range/algorithm/search_n.hpp +++ b/include/boost/range/algorithm/search_n.hpp @@ -35,7 +35,7 @@ template< typename ForwardRange, typename Integer, typename Value > inline typename range_iterator::type search_n(ForwardRange& rng, Integer count, const Value& value) { - BOOST_CONCEPT_ASSERT((ForwardRangeConcept)); + BOOST_RANGE_CONCEPT_ASSERT((ForwardRangeConcept)); return std::search_n(boost::begin(rng),boost::end(rng), count, value); } @@ -44,7 +44,7 @@ template< typename ForwardRange, typename Integer, typename Value > inline typename range_iterator::type search_n(const ForwardRange& rng, Integer count, const Value& value) { - BOOST_CONCEPT_ASSERT((ForwardRangeConcept)); + BOOST_RANGE_CONCEPT_ASSERT((ForwardRangeConcept)); return std::search_n(boost::begin(rng), boost::end(rng), count, value); } @@ -55,8 +55,8 @@ inline typename range_iterator::type search_n(ForwardRange& rng, Integer count, const Value& value, BinaryPredicate binary_pred) { - BOOST_CONCEPT_ASSERT((ForwardRangeConcept)); - BOOST_CONCEPT_ASSERT((BinaryPredicateConcept)); + BOOST_RANGE_CONCEPT_ASSERT((BinaryPredicateConcept::type, const Value&>)); return std::search_n(boost::begin(rng), boost::end(rng), count, value, binary_pred); @@ -69,8 +69,8 @@ inline typename range_iterator::type search_n(const ForwardRange& rng, Integer count, const Value& value, BinaryPredicate binary_pred) { - BOOST_CONCEPT_ASSERT((ForwardRangeConcept)); - BOOST_CONCEPT_ASSERT((BinaryPredicateConcept)); + BOOST_RANGE_CONCEPT_ASSERT((BinaryPredicateConcept::type, const Value&>)); return std::search_n(boost::begin(rng), boost::end(rng), count, value, binary_pred); @@ -84,7 +84,7 @@ template< range_return_value re, typename ForwardRange, typename Integer, inline typename range_return::type search_n(ForwardRange& rng, Integer count, const Value& value) { - BOOST_CONCEPT_ASSERT((ForwardRangeConcept)); + BOOST_RANGE_CONCEPT_ASSERT((ForwardRangeConcept)); return range_return:: pack(std::search_n(boost::begin(rng),boost::end(rng), count, value), @@ -97,7 +97,7 @@ template< range_return_value re, typename ForwardRange, typename Integer, inline typename range_return::type search_n(const ForwardRange& rng, Integer count, const Value& value) { - BOOST_CONCEPT_ASSERT((ForwardRangeConcept)); + BOOST_RANGE_CONCEPT_ASSERT((ForwardRangeConcept)); return range_return:: pack(std::search_n(boost::begin(rng), boost::end(rng), count, value), @@ -111,8 +111,8 @@ inline typename range_return::type search_n(ForwardRange& rng, Integer count, const Value& value, BinaryPredicate pred) { - BOOST_CONCEPT_ASSERT((ForwardRangeConcept)); - BOOST_CONCEPT_ASSERT((BinaryPredicateConcept)); + BOOST_RANGE_CONCEPT_ASSERT((BinaryPredicateConcept::type, const Value&>)); return range_return:: @@ -128,8 +128,8 @@ inline typename range_return::type search_n(const ForwardRange& rng, Integer count, const Value& value, BinaryPredicate pred) { - BOOST_CONCEPT_ASSERT((ForwardRangeConcept)); - BOOST_CONCEPT_ASSERT((BinaryPredicateConcept)); + BOOST_RANGE_CONCEPT_ASSERT((BinaryPredicateConcept::type, const Value&>)); return range_return:: diff --git a/include/boost/range/algorithm/set_algorithm.hpp b/include/boost/range/algorithm/set_algorithm.hpp index ce7e9b1..82ef8ec 100755 --- a/include/boost/range/algorithm/set_algorithm.hpp +++ b/include/boost/range/algorithm/set_algorithm.hpp @@ -31,8 +31,8 @@ template inline bool includes(const SinglePassRange1& rng1, const SinglePassRange2& rng2) { - BOOST_CONCEPT_ASSERT(( SinglePassRangeConcept )); - BOOST_CONCEPT_ASSERT(( SinglePassRangeConcept )); + BOOST_RANGE_CONCEPT_ASSERT(( SinglePassRangeConcept )); + BOOST_RANGE_CONCEPT_ASSERT(( SinglePassRangeConcept )); return std::includes(boost::begin(rng1),boost::end(rng1), boost::begin(rng2),boost::end(rng2)); } @@ -44,8 +44,8 @@ inline bool includes(const SinglePassRange1& rng1, const SinglePassRange2& rng2, BinaryPredicate pred) { - BOOST_CONCEPT_ASSERT(( SinglePassRangeConcept )); - BOOST_CONCEPT_ASSERT(( SinglePassRangeConcept )); + BOOST_RANGE_CONCEPT_ASSERT(( SinglePassRangeConcept )); + BOOST_RANGE_CONCEPT_ASSERT(( SinglePassRangeConcept )); return std::includes(boost::begin(rng1), boost::end(rng1), boost::begin(rng2), boost::end(rng2), pred); } @@ -63,8 +63,8 @@ inline OutputIterator set_union(const SinglePassRange1& rng1, const SinglePassRange2& rng2, OutputIterator out) { - BOOST_CONCEPT_ASSERT(( SinglePassRangeConcept )); - BOOST_CONCEPT_ASSERT(( SinglePassRangeConcept )); + BOOST_RANGE_CONCEPT_ASSERT(( SinglePassRangeConcept )); + BOOST_RANGE_CONCEPT_ASSERT(( SinglePassRangeConcept )); return std::set_union(boost::begin(rng1), boost::end(rng1), boost::begin(rng2), boost::end(rng2), out); } @@ -77,8 +77,8 @@ inline OutputIterator set_union(const SinglePassRange1& rng1, OutputIterator out, BinaryPredicate pred) { - BOOST_CONCEPT_ASSERT(( SinglePassRangeConcept )); - BOOST_CONCEPT_ASSERT(( SinglePassRangeConcept )); + BOOST_RANGE_CONCEPT_ASSERT(( SinglePassRangeConcept )); + BOOST_RANGE_CONCEPT_ASSERT(( SinglePassRangeConcept )); return std::set_union(boost::begin(rng1), boost::end(rng1), boost::begin(rng2), boost::end(rng2), out, pred); } @@ -96,8 +96,8 @@ inline OutputIterator set_intersection(const SinglePassRange1& rng1, const SinglePassRange2& rng2, OutputIterator out) { - BOOST_CONCEPT_ASSERT(( SinglePassRangeConcept )); - BOOST_CONCEPT_ASSERT(( SinglePassRangeConcept )); + BOOST_RANGE_CONCEPT_ASSERT(( SinglePassRangeConcept )); + BOOST_RANGE_CONCEPT_ASSERT(( SinglePassRangeConcept )); return std::set_intersection(boost::begin(rng1), boost::end(rng1), boost::begin(rng2), boost::end(rng2), out); } @@ -110,8 +110,8 @@ inline OutputIterator set_intersection(const SinglePassRange1& rng1, OutputIterator out, BinaryPredicate pred) { - BOOST_CONCEPT_ASSERT(( SinglePassRangeConcept )); - BOOST_CONCEPT_ASSERT(( SinglePassRangeConcept )); + BOOST_RANGE_CONCEPT_ASSERT(( SinglePassRangeConcept )); + BOOST_RANGE_CONCEPT_ASSERT(( SinglePassRangeConcept )); return std::set_intersection(boost::begin(rng1), boost::end(rng1), boost::begin(rng2), boost::end(rng2), out, pred); @@ -130,8 +130,8 @@ inline OutputIterator set_difference(const SinglePassRange1& rng1, const SinglePassRange2& rng2, OutputIterator out) { - BOOST_CONCEPT_ASSERT(( SinglePassRangeConcept )); - BOOST_CONCEPT_ASSERT(( SinglePassRangeConcept )); + BOOST_RANGE_CONCEPT_ASSERT(( SinglePassRangeConcept )); + BOOST_RANGE_CONCEPT_ASSERT(( SinglePassRangeConcept )); return std::set_difference(boost::begin(rng1), boost::end(rng1), boost::begin(rng2), boost::end(rng2), out); } @@ -144,8 +144,8 @@ inline OutputIterator set_difference(const SinglePassRange1& rng1, OutputIterator out, BinaryPredicate pred) { - BOOST_CONCEPT_ASSERT(( SinglePassRangeConcept )); - BOOST_CONCEPT_ASSERT(( SinglePassRangeConcept )); + BOOST_RANGE_CONCEPT_ASSERT(( SinglePassRangeConcept )); + BOOST_RANGE_CONCEPT_ASSERT(( SinglePassRangeConcept )); return std::set_difference( boost::begin(rng1), boost::end(rng1), boost::begin(rng2), boost::end(rng2), out, pred); @@ -165,8 +165,8 @@ set_symmetric_difference(const SinglePassRange1& rng1, const SinglePassRange2& rng2, OutputIterator out) { - BOOST_CONCEPT_ASSERT(( SinglePassRangeConcept )); - BOOST_CONCEPT_ASSERT(( SinglePassRangeConcept )); + BOOST_RANGE_CONCEPT_ASSERT(( SinglePassRangeConcept )); + BOOST_RANGE_CONCEPT_ASSERT(( SinglePassRangeConcept )); return std::set_symmetric_difference(boost::begin(rng1), boost::end(rng1), boost::begin(rng2), boost::end(rng2), out); } @@ -180,8 +180,8 @@ set_symmetric_difference(const SinglePassRange1& rng1, OutputIterator out, BinaryPredicate pred) { - BOOST_CONCEPT_ASSERT(( SinglePassRangeConcept )); - BOOST_CONCEPT_ASSERT(( SinglePassRangeConcept )); + BOOST_RANGE_CONCEPT_ASSERT(( SinglePassRangeConcept )); + BOOST_RANGE_CONCEPT_ASSERT(( SinglePassRangeConcept )); return std::set_symmetric_difference( boost::begin(rng1), boost::end(rng1), boost::begin(rng2), boost::end(rng2), out, pred); diff --git a/include/boost/range/algorithm/sort.hpp b/include/boost/range/algorithm/sort.hpp index 238c48d..a160907 100755 --- a/include/boost/range/algorithm/sort.hpp +++ b/include/boost/range/algorithm/sort.hpp @@ -29,7 +29,7 @@ namespace boost template inline RandomAccessRange& sort(RandomAccessRange& rng) { - BOOST_CONCEPT_ASSERT(( RandomAccessRangeConcept )); + BOOST_RANGE_CONCEPT_ASSERT(( RandomAccessRangeConcept )); std::sort(boost::begin(rng), boost::end(rng)); return rng; } @@ -38,7 +38,7 @@ inline RandomAccessRange& sort(RandomAccessRange& rng) template inline const RandomAccessRange& sort(const RandomAccessRange& rng) { - BOOST_CONCEPT_ASSERT(( RandomAccessRangeConcept )); + BOOST_RANGE_CONCEPT_ASSERT(( RandomAccessRangeConcept )); std::sort(boost::begin(rng),boost::end(rng)); return rng; } @@ -47,7 +47,7 @@ inline const RandomAccessRange& sort(const RandomAccessRange& rng) template inline RandomAccessRange& sort(RandomAccessRange& rng, BinaryPredicate pred) { - BOOST_CONCEPT_ASSERT(( RandomAccessRangeConcept )); + BOOST_RANGE_CONCEPT_ASSERT(( RandomAccessRangeConcept )); std::sort(boost::begin(rng), boost::end(rng), pred); return rng; } @@ -56,7 +56,7 @@ inline RandomAccessRange& sort(RandomAccessRange& rng, BinaryPredicate pred) template inline const RandomAccessRange& sort(const RandomAccessRange& rng, BinaryPredicate pred) { - BOOST_CONCEPT_ASSERT(( RandomAccessRangeConcept )); + BOOST_RANGE_CONCEPT_ASSERT(( RandomAccessRangeConcept )); std::sort(boost::begin(rng), boost::end(rng), pred); return rng; } diff --git a/include/boost/range/algorithm/stable_partition.hpp b/include/boost/range/algorithm/stable_partition.hpp index 46cb616..24febfc 100755 --- a/include/boost/range/algorithm/stable_partition.hpp +++ b/include/boost/range/algorithm/stable_partition.hpp @@ -31,7 +31,7 @@ template inline BOOST_DEDUCED_TYPENAME range_iterator::type stable_partition(BidirectionalRange& rng, UnaryPredicate pred) { - BOOST_CONCEPT_ASSERT(( BidirectionalRangeConcept )); + BOOST_RANGE_CONCEPT_ASSERT(( BidirectionalRangeConcept )); return std::stable_partition(boost::begin(rng), boost::end(rng), pred); } @@ -40,7 +40,7 @@ template inline BOOST_DEDUCED_TYPENAME range_iterator::type stable_partition(const BidirectionalRange& rng, UnaryPredicate pred) { - BOOST_CONCEPT_ASSERT(( BidirectionalRangeConcept )); + BOOST_RANGE_CONCEPT_ASSERT(( BidirectionalRangeConcept )); return std::stable_partition(boost::begin(rng),boost::end(rng),pred); } @@ -49,7 +49,7 @@ template inline BOOST_DEDUCED_TYPENAME range_return::type stable_partition(BidirectionalRange& rng, UnaryPredicate pred) { - BOOST_CONCEPT_ASSERT(( BidirectionalRangeConcept )); + BOOST_RANGE_CONCEPT_ASSERT(( BidirectionalRangeConcept )); return range_return::pack( std::stable_partition(boost::begin(rng), boost::end(rng), pred), rng); @@ -60,7 +60,7 @@ template inline BOOST_DEDUCED_TYPENAME range_return::type stable_partition(const BidirectionalRange& rng, UnaryPredicate pred) { - BOOST_CONCEPT_ASSERT(( BidirectionalRangeConcept )); + BOOST_RANGE_CONCEPT_ASSERT(( BidirectionalRangeConcept )); return range_return::pack( std::stable_partition(boost::begin(rng),boost::end(rng),pred), rng); diff --git a/include/boost/range/algorithm/stable_sort.hpp b/include/boost/range/algorithm/stable_sort.hpp index 700933e..d18da4d 100755 --- a/include/boost/range/algorithm/stable_sort.hpp +++ b/include/boost/range/algorithm/stable_sort.hpp @@ -29,7 +29,7 @@ namespace boost template inline RandomAccessRange& stable_sort(RandomAccessRange& rng) { - BOOST_CONCEPT_ASSERT(( RandomAccessRangeConcept )); + BOOST_RANGE_CONCEPT_ASSERT(( RandomAccessRangeConcept )); std::stable_sort(boost::begin(rng), boost::end(rng)); return rng; } @@ -38,7 +38,7 @@ inline RandomAccessRange& stable_sort(RandomAccessRange& rng) template inline const RandomAccessRange& stable_sort(const RandomAccessRange& rng) { - BOOST_CONCEPT_ASSERT(( RandomAccessRangeConcept )); + BOOST_RANGE_CONCEPT_ASSERT(( RandomAccessRangeConcept )); std::stable_sort(boost::begin(rng), boost::end(rng)); return rng; } @@ -47,7 +47,7 @@ inline const RandomAccessRange& stable_sort(const RandomAccessRange& rng) template inline RandomAccessRange& stable_sort(RandomAccessRange& rng, BinaryPredicate sort_pred) { - BOOST_CONCEPT_ASSERT(( RandomAccessRangeConcept )); + BOOST_RANGE_CONCEPT_ASSERT(( RandomAccessRangeConcept )); std::stable_sort(boost::begin(rng), boost::end(rng), sort_pred); return rng; } @@ -56,7 +56,7 @@ inline RandomAccessRange& stable_sort(RandomAccessRange& rng, BinaryPredicate so template inline const RandomAccessRange& stable_sort(const RandomAccessRange& rng, BinaryPredicate sort_pred) { - BOOST_CONCEPT_ASSERT(( RandomAccessRangeConcept )); + BOOST_RANGE_CONCEPT_ASSERT(( RandomAccessRangeConcept )); std::stable_sort(boost::begin(rng), boost::end(rng), sort_pred); return rng; } diff --git a/include/boost/range/algorithm/swap_ranges.hpp b/include/boost/range/algorithm/swap_ranges.hpp index ffc0fc8..1acee0d 100755 --- a/include/boost/range/algorithm/swap_ranges.hpp +++ b/include/boost/range/algorithm/swap_ranges.hpp @@ -70,8 +70,8 @@ template< typename SinglePassRange1, typename SinglePassRange2 > inline SinglePassRange2& swap_ranges(SinglePassRange1& range1, SinglePassRange2& range2) { - BOOST_CONCEPT_ASSERT((SinglePassRangeConcept)); - BOOST_CONCEPT_ASSERT((SinglePassRangeConcept)); + BOOST_RANGE_CONCEPT_ASSERT((SinglePassRangeConcept)); + BOOST_RANGE_CONCEPT_ASSERT((SinglePassRangeConcept)); boost::range_detail::swap_ranges_impl( boost::begin(range1), boost::end(range1), diff --git a/include/boost/range/algorithm/transform.hpp b/include/boost/range/algorithm/transform.hpp index d12904b..28f423d 100755 --- a/include/boost/range/algorithm/transform.hpp +++ b/include/boost/range/algorithm/transform.hpp @@ -38,7 +38,7 @@ namespace boost OutputIterator out, UnaryOperation fun) { - BOOST_CONCEPT_ASSERT(( SinglePassRangeConcept )); + BOOST_RANGE_CONCEPT_ASSERT(( SinglePassRangeConcept )); return std::transform(boost::begin(rng),boost::end(rng),out,fun); } @@ -82,8 +82,8 @@ namespace boost OutputIterator out, BinaryOperation fun) { - BOOST_CONCEPT_ASSERT(( SinglePassRangeConcept )); - BOOST_CONCEPT_ASSERT(( SinglePassRangeConcept )); + BOOST_RANGE_CONCEPT_ASSERT(( SinglePassRangeConcept )); + BOOST_RANGE_CONCEPT_ASSERT(( SinglePassRangeConcept )); return range_detail::transform_impl( boost::begin(rng1), boost::end(rng1), boost::begin(rng2), boost::end(rng2), diff --git a/include/boost/range/algorithm/unique.hpp b/include/boost/range/algorithm/unique.hpp index 43e3b82..be6eaf9 100755 --- a/include/boost/range/algorithm/unique.hpp +++ b/include/boost/range/algorithm/unique.hpp @@ -30,7 +30,7 @@ template< range_return_value re, class ForwardRange > inline BOOST_DEDUCED_TYPENAME range_return::type unique( ForwardRange& rng ) { - BOOST_CONCEPT_ASSERT(( ForwardRangeConcept )); + BOOST_RANGE_CONCEPT_ASSERT(( ForwardRangeConcept )); return range_return:: pack( std::unique( boost::begin(rng), boost::end(rng)), rng ); @@ -41,7 +41,7 @@ template< range_return_value re, class ForwardRange > inline BOOST_DEDUCED_TYPENAME range_return::type unique( const ForwardRange& rng ) { - BOOST_CONCEPT_ASSERT(( ForwardRangeConcept )); + BOOST_RANGE_CONCEPT_ASSERT(( ForwardRangeConcept )); return range_return:: pack( std::unique( boost::begin(rng), boost::end(rng)), rng ); @@ -51,7 +51,7 @@ template< range_return_value re, class ForwardRange, class BinaryPredicate > inline BOOST_DEDUCED_TYPENAME range_return::type unique( ForwardRange& rng, BinaryPredicate pred ) { - BOOST_CONCEPT_ASSERT(( ForwardRangeConcept )); + BOOST_RANGE_CONCEPT_ASSERT(( ForwardRangeConcept )); return range_return:: pack(std::unique(boost::begin(rng), boost::end(rng), pred), rng); @@ -61,7 +61,7 @@ template< range_return_value re, class ForwardRange, class BinaryPredicate > inline BOOST_DEDUCED_TYPENAME range_return::type unique( const ForwardRange& rng, BinaryPredicate pred ) { - BOOST_CONCEPT_ASSERT(( ForwardRangeConcept )); + BOOST_RANGE_CONCEPT_ASSERT(( ForwardRangeConcept )); return range_return:: pack(std::unique(boost::begin(rng), boost::end(rng), pred), rng); @@ -72,7 +72,7 @@ template< class ForwardRange > inline BOOST_DEDUCED_TYPENAME range_return::type unique( ForwardRange& rng ) { - BOOST_CONCEPT_ASSERT(( ForwardRangeConcept )); + BOOST_RANGE_CONCEPT_ASSERT(( ForwardRangeConcept )); return ::boost::range::unique(rng); } /// \overload @@ -80,7 +80,7 @@ template< class ForwardRange > inline BOOST_DEDUCED_TYPENAME range_return::type unique( const ForwardRange& rng ) { - BOOST_CONCEPT_ASSERT(( ForwardRangeConcept )); + BOOST_RANGE_CONCEPT_ASSERT(( ForwardRangeConcept )); return ::boost::range::unique(rng); } /// \overload @@ -88,7 +88,7 @@ template< class ForwardRange, class BinaryPredicate > inline BOOST_DEDUCED_TYPENAME range_return::type unique( ForwardRange& rng, BinaryPredicate pred ) { - BOOST_CONCEPT_ASSERT(( ForwardRangeConcept )); + BOOST_RANGE_CONCEPT_ASSERT(( ForwardRangeConcept )); return ::boost::range::unique(rng); } /// \overload @@ -96,7 +96,7 @@ template< class ForwardRange, class BinaryPredicate > inline BOOST_DEDUCED_TYPENAME range_iterator::type unique( const ForwardRange& rng, BinaryPredicate pred ) { - BOOST_CONCEPT_ASSERT(( ForwardRangeConcept )); + BOOST_RANGE_CONCEPT_ASSERT(( ForwardRangeConcept )); return ::boost::range::unique(rng, pred); } diff --git a/include/boost/range/algorithm/unique_copy.hpp b/include/boost/range/algorithm/unique_copy.hpp index 909017b..0682d74 100755 --- a/include/boost/range/algorithm/unique_copy.hpp +++ b/include/boost/range/algorithm/unique_copy.hpp @@ -31,7 +31,7 @@ template< class SinglePassRange, class OutputIterator > inline OutputIterator unique_copy( const SinglePassRange& rng, OutputIterator out_it ) { - BOOST_CONCEPT_ASSERT(( SinglePassRangeConcept )); + BOOST_RANGE_CONCEPT_ASSERT(( SinglePassRangeConcept )); return std::unique_copy(boost::begin(rng), boost::end(rng), out_it); } /// \overload @@ -40,7 +40,7 @@ inline OutputIterator unique_copy( const SinglePassRange& rng, OutputIterator out_it, BinaryPredicate pred ) { - BOOST_CONCEPT_ASSERT(( SinglePassRangeConcept )); + BOOST_RANGE_CONCEPT_ASSERT(( SinglePassRangeConcept )); return std::unique_copy(boost::begin(rng), boost::end(rng), out_it, pred); } diff --git a/include/boost/range/algorithm/upper_bound.hpp b/include/boost/range/algorithm/upper_bound.hpp index fa755c1..8aa26bd 100755 --- a/include/boost/range/algorithm/upper_bound.hpp +++ b/include/boost/range/algorithm/upper_bound.hpp @@ -30,7 +30,7 @@ template< class ForwardRange, class Value > inline BOOST_DEDUCED_TYPENAME range_iterator::type upper_bound( ForwardRange& rng, Value val ) { - BOOST_CONCEPT_ASSERT(( ForwardRangeConcept )); + BOOST_RANGE_CONCEPT_ASSERT(( ForwardRangeConcept )); return std::upper_bound(boost::begin(rng), boost::end(rng), val); } /// \overload @@ -39,7 +39,7 @@ template< class ForwardRange, class Value, class SortPredicate > inline BOOST_DEDUCED_TYPENAME range_iterator::type upper_bound( ForwardRange& rng, Value val, SortPredicate pred ) { - BOOST_CONCEPT_ASSERT(( ForwardRangeConcept )); + BOOST_RANGE_CONCEPT_ASSERT(( ForwardRangeConcept )); return std::upper_bound(boost::begin(rng), boost::end(rng), val, pred); } /// \overload @@ -47,7 +47,7 @@ template< range_return_value re, class ForwardRange, class Value > inline BOOST_DEDUCED_TYPENAME range_return::type upper_bound( ForwardRange& rng, Value val ) { - BOOST_CONCEPT_ASSERT(( ForwardRangeConcept )); + BOOST_RANGE_CONCEPT_ASSERT(( ForwardRangeConcept )); return range_return:: pack(std::upper_bound(boost::begin(rng), boost::end(rng), val), rng); @@ -58,7 +58,7 @@ template< range_return_value re, class ForwardRange, class Value, inline BOOST_DEDUCED_TYPENAME range_return::type upper_bound( ForwardRange& rng, Value val, SortPredicate pred ) { - BOOST_CONCEPT_ASSERT(( ForwardRangeConcept )); + BOOST_RANGE_CONCEPT_ASSERT(( ForwardRangeConcept )); return range_return:: pack(std::upper_bound(boost::begin(rng), boost::end(rng), val, pred), rng); diff --git a/include/boost/range/algorithm_ext/is_sorted.hpp b/include/boost/range/algorithm_ext/is_sorted.hpp index fc7b522..e3e51e2 100755 --- a/include/boost/range/algorithm_ext/is_sorted.hpp +++ b/include/boost/range/algorithm_ext/is_sorted.hpp @@ -47,8 +47,8 @@ namespace boost template inline bool is_sorted(const SinglePassRange& rng) { - BOOST_CONCEPT_ASSERT((SinglePassRangeConcept)); - BOOST_CONCEPT_ASSERT((LessThanComparableConcept::type>)); + BOOST_RANGE_CONCEPT_ASSERT((SinglePassRangeConcept)); + BOOST_RANGE_CONCEPT_ASSERT((LessThanComparableConcept::type>)); return range_detail::is_sorted(boost::begin(rng), boost::end(rng)); } @@ -56,8 +56,8 @@ namespace boost template inline bool is_sorted(const SinglePassRange& rng, BinaryPredicate pred) { - BOOST_CONCEPT_ASSERT((SinglePassRangeConcept)); - BOOST_CONCEPT_ASSERT((BinaryPredicateConcept::type, typename range_value::type>)); + BOOST_RANGE_CONCEPT_ASSERT((SinglePassRangeConcept)); + BOOST_RANGE_CONCEPT_ASSERT((BinaryPredicateConcept::type, typename range_value::type>)); return range_detail::is_sorted(boost::begin(rng), boost::end(rng), pred); } } diff --git a/include/boost/range/concepts.hpp b/include/boost/range/concepts.hpp index cc039aa..8e4d2cf 100644 --- a/include/boost/range/concepts.hpp +++ b/include/boost/range/concepts.hpp @@ -60,6 +60,40 @@ namespace boost { namespace range_detail { +#ifndef BOOST_RANGE_ENABLE_CONCEPT_ASSERT + +// List broken compiler versions here: + #ifdef __GNUC__ + // GNUC 4.2 has strange issues correctly detecting compliance with the Concepts + // hence the least disruptive approach is to turn-off the concept checking for + // this version of the compiler. + #if __GNUC__ == 4 && __GNUC_MINOR__ == 2 + #define BOOST_RANGE_ENABLE_CONCEPT_ASSERT 0 + #endif + #endif + + #ifdef __BORLANDC__ + #define BOOST_RANGE_ENABLE_CONCEPT_ASSERT 0 + #endif + + #ifdef __PATHCC__ + #define BOOST_RANGE_ENABLE_CONCEPT_ASSERT 0 + #endif + +// Default to using the concept asserts unless we have defined it off +// during the search for black listed compilers. + #ifndef BOOST_RANGE_ENABLE_CONCEPT_ASSERT + #define BOOST_RANGE_ENABLE_CONCEPT_ASSERT 1 + #endif + +#endif + +#if BOOST_RANGE_ENABLE_CONCEPT_ASSERT + #define BOOST_RANGE_CONCEPT_ASSERT( x ) BOOST_CONCEPT_ASSERT( x ) +#else + #define BOOST_RANGE_CONCEPT_ASSERT( x ) +#endif + // Rationale for the inclusion of redefined iterator concept // classes: // @@ -77,9 +111,10 @@ namespace boost { template struct IncrementableIteratorConcept : CopyConstructible { +#if BOOST_RANGE_ENABLE_CONCEPT_ASSERT typedef BOOST_DEDUCED_TYPENAME iterator_traversal::type traversal_category; - BOOST_CONCEPT_ASSERT(( + BOOST_RANGE_CONCEPT_ASSERT(( Convertible< traversal_category, incrementable_traversal_tag @@ -92,6 +127,7 @@ namespace boost { } private: Iterator i; +#endif }; template @@ -99,11 +135,13 @@ namespace boost { : IncrementableIteratorConcept , EqualityComparable { - BOOST_CONCEPT_ASSERT(( +#if BOOST_RANGE_ENABLE_CONCEPT_ASSERT + BOOST_RANGE_CONCEPT_ASSERT(( Convertible< BOOST_DEDUCED_TYPENAME SinglePassIteratorConcept::traversal_category, single_pass_traversal_tag >)); +#endif }; template @@ -111,23 +149,26 @@ namespace boost { : SinglePassIteratorConcept , DefaultConstructible { +#if BOOST_RANGE_ENABLE_CONCEPT_ASSERT typedef BOOST_DEDUCED_TYPENAME boost::detail::iterator_traits::difference_type difference_type; BOOST_MPL_ASSERT((is_integral)); BOOST_MPL_ASSERT_RELATION(std::numeric_limits::is_signed, ==, true); - BOOST_CONCEPT_ASSERT(( + BOOST_RANGE_CONCEPT_ASSERT(( Convertible< BOOST_DEDUCED_TYPENAME ForwardIteratorConcept::traversal_category, forward_traversal_tag >)); +#endif }; template struct BidirectionalIteratorConcept : ForwardIteratorConcept { - BOOST_CONCEPT_ASSERT(( + #if BOOST_RANGE_ENABLE_CONCEPT_ASSERT + BOOST_RANGE_CONCEPT_ASSERT(( Convertible< BOOST_DEDUCED_TYPENAME BidirectionalIteratorConcept::traversal_category, bidirectional_traversal_tag @@ -140,13 +181,15 @@ namespace boost { } private: Iterator i; + #endif }; template struct RandomAccessIteratorConcept : BidirectionalIteratorConcept { - BOOST_CONCEPT_ASSERT(( + #if BOOST_RANGE_ENABLE_CONCEPT_ASSERT + BOOST_RANGE_CONCEPT_ASSERT(( Convertible< BOOST_DEDUCED_TYPENAME RandomAccessIteratorConcept::traversal_category, random_access_traversal_tag @@ -165,6 +208,7 @@ namespace boost { BOOST_DEDUCED_TYPENAME RandomAccessIteratorConcept::difference_type n; Iterator i; Iterator j; + #endif }; } // namespace range_detail @@ -173,11 +217,12 @@ namespace boost { template struct SinglePassRangeConcept { +#if BOOST_RANGE_ENABLE_CONCEPT_ASSERT typedef BOOST_DEDUCED_TYPENAME range_iterator::type const_iterator; typedef BOOST_DEDUCED_TYPENAME range_iterator::type iterator; - BOOST_CONCEPT_ASSERT((range_detail::SinglePassIteratorConcept)); - BOOST_CONCEPT_ASSERT((range_detail::SinglePassIteratorConcept)); + BOOST_RANGE_CONCEPT_ASSERT((range_detail::SinglePassIteratorConcept)); + BOOST_RANGE_CONCEPT_ASSERT((range_detail::SinglePassIteratorConcept)); BOOST_CONCEPT_USAGE(SinglePassRangeConcept) { @@ -208,19 +253,23 @@ namespace boost { // T to be an abstract class. The other obvious alternative of // T& produces a warning on some compilers. T* m_range; +#endif }; //! Check if a type T models the ForwardRange range concept. template struct ForwardRangeConcept : SinglePassRangeConcept { - BOOST_CONCEPT_ASSERT((range_detail::ForwardIteratorConcept)); - BOOST_CONCEPT_ASSERT((range_detail::ForwardIteratorConcept)); +#if BOOST_RANGE_ENABLE_CONCEPT_ASSERT + BOOST_RANGE_CONCEPT_ASSERT((range_detail::ForwardIteratorConcept)); + BOOST_RANGE_CONCEPT_ASSERT((range_detail::ForwardIteratorConcept)); +#endif }; template struct WriteableRangeConcept { +#if BOOST_RANGE_ENABLE_CONCEPT_ASSERT typedef BOOST_DEDUCED_TYPENAME range_iterator::type iterator; BOOST_CONCEPT_USAGE(WriteableRangeConcept) @@ -230,6 +279,7 @@ namespace boost { private: iterator i; BOOST_DEDUCED_TYPENAME range_value::type v; +#endif }; //! Check if a type T models the WriteableForwardRange range concept. @@ -244,8 +294,10 @@ namespace boost { template struct BidirectionalRangeConcept : ForwardRangeConcept { - BOOST_CONCEPT_ASSERT((BidirectionalIteratorConcept)); - BOOST_CONCEPT_ASSERT((BidirectionalIteratorConcept)); +#if BOOST_RANGE_ENABLE_CONCEPT_ASSERT + BOOST_RANGE_CONCEPT_ASSERT((BidirectionalIteratorConcept)); + BOOST_RANGE_CONCEPT_ASSERT((BidirectionalIteratorConcept)); +#endif }; //! Check if a type T models the WriteableBidirectionalRange range concept. @@ -260,8 +312,10 @@ namespace boost { template struct RandomAccessRangeConcept : BidirectionalRangeConcept { - BOOST_CONCEPT_ASSERT((RandomAccessIteratorConcept)); - BOOST_CONCEPT_ASSERT((RandomAccessIteratorConcept)); +#if BOOST_RANGE_ENABLE_CONCEPT_ASSERT + BOOST_RANGE_CONCEPT_ASSERT((RandomAccessIteratorConcept)); + BOOST_RANGE_CONCEPT_ASSERT((RandomAccessIteratorConcept)); +#endif }; //! Check if a type T models the WriteableRandomAccessRange range concept. diff --git a/include/boost/range/join.hpp b/include/boost/range/join.hpp index 5e8f064..374df86 100644 --- a/include/boost/range/join.hpp +++ b/include/boost/range/join.hpp @@ -28,8 +28,8 @@ iterator_range join(const SinglePassRange1& r1, const SinglePassRange2& r2) { - BOOST_CONCEPT_ASSERT(( SinglePassRangeConcept )); - BOOST_CONCEPT_ASSERT(( SinglePassRangeConcept )); + BOOST_RANGE_CONCEPT_ASSERT(( SinglePassRangeConcept )); + BOOST_RANGE_CONCEPT_ASSERT(( SinglePassRangeConcept )); typedef range_detail::join_iterator< BOOST_DEDUCED_TYPENAME range_iterator::type, @@ -50,8 +50,8 @@ iterator_range join(SinglePassRange1& r1, SinglePassRange2& r2) { - BOOST_CONCEPT_ASSERT(( SinglePassRangeConcept )); - BOOST_CONCEPT_ASSERT(( SinglePassRangeConcept )); + BOOST_RANGE_CONCEPT_ASSERT(( SinglePassRangeConcept )); + BOOST_RANGE_CONCEPT_ASSERT(( SinglePassRangeConcept )); typedef range_detail::join_iterator< BOOST_DEDUCED_TYPENAME range_iterator::type,