From e2957cfb0c2da1dd94c4e9d81ae7eed61f3ec783 Mon Sep 17 00:00:00 2001 From: Dave Abrahams Date: Sun, 30 Apr 2006 03:33:33 +0000 Subject: [PATCH] use idiomatic convertibility assertions. [SVN r33869] --- include/boost/iterator/iterator_concepts.hpp | 27 ++++++++++---------- 1 file changed, 13 insertions(+), 14 deletions(-) diff --git a/include/boost/iterator/iterator_concepts.hpp b/include/boost/iterator/iterator_concepts.hpp index 810e2c2..bb20aed 100644 --- a/include/boost/iterator/iterator_concepts.hpp +++ b/include/boost/iterator/iterator_concepts.hpp @@ -20,7 +20,6 @@ #include #include -#include #include #include @@ -118,11 +117,11 @@ namespace boost_concepts ~IncrementableIteratorConcept() { - BOOST_MPL_ASSERT(( - boost::is_convertible< - traversal_category - , boost::incrementable_traversal_tag - > )); + BOOST_CONCEPT_ASSERT(( + boost::ConvertibleConcept< + traversal_category + , boost::incrementable_traversal_tag + >)); ++i; (void)i++; @@ -139,8 +138,8 @@ namespace boost_concepts { ~SinglePassIteratorConcept() { - BOOST_MPL_ASSERT(( - boost::is_convertible< + BOOST_CONCEPT_ASSERT(( + boost::ConvertibleConcept< BOOST_DEDUCED_TYPENAME SinglePassIteratorConcept::traversal_category , boost::single_pass_traversal_tag > )); @@ -159,8 +158,8 @@ namespace boost_concepts BOOST_MPL_ASSERT((boost::is_integral)); BOOST_MPL_ASSERT_RELATION(std::numeric_limits::is_signed, ==, true); - BOOST_MPL_ASSERT(( - boost::is_convertible< + BOOST_CONCEPT_ASSERT(( + boost::ConvertibleConcept< BOOST_DEDUCED_TYPENAME ForwardTraversalConcept::traversal_category , boost::forward_traversal_tag > )); @@ -173,8 +172,8 @@ namespace boost_concepts { ~BidirectionalTraversalConcept() { - BOOST_MPL_ASSERT(( - boost::is_convertible< + BOOST_CONCEPT_ASSERT(( + boost::ConvertibleConcept< BOOST_DEDUCED_TYPENAME BidirectionalTraversalConcept::traversal_category , boost::bidirectional_traversal_tag > )); @@ -193,8 +192,8 @@ namespace boost_concepts public: ~RandomAccessTraversalConcept() { - BOOST_MPL_ASSERT(( - boost::is_convertible< + BOOST_CONCEPT_ASSERT(( + boost::ConvertibleConcept< BOOST_DEDUCED_TYPENAME RandomAccessTraversalConcept::traversal_category , boost::random_access_traversal_tag > ));