Changeset 3521

Timestamp:

Oct 7, 2016, 9:37:06 AM (7 years ago)

Author:

Peter

Message:

refs #803

In WeightIterator? and DataIterator? require that BASE models concept
DataIterator? directly (rather than implicit requirements).

Location:

trunk/yat/utility

Files:

• DataIterator.h (modified) (4 diffs)
• WeightIterator.h (modified) (5 diffs)

trunk/yat/utility/DataIterator.h

@@ -24 +24 @@
 */
 
+#include "concept_check.h"
 #include "iterator_traits.h"
 
@@ -77 +78 @@
       : DataIterator::iterator_adaptor_(b)
     {
-      BOOST_CONCEPT_ASSERT((boost::InputIterator<Base>));
+      BOOST_CONCEPT_ASSERT((DataIteratorConcept<Base>));
     }
 
@@ -88 +89 @@
       : DataIterator::iterator_adaptor_()
     {
-      BOOST_CONCEPT_ASSERT((boost::InputIterator<Base>));
+      BOOST_CONCEPT_ASSERT((DataIteratorConcept<Base>));
     }
 
@@ -101 +102 @@
     DataIterator(DataIterator<B2> other,
                  typename boost::enable_if_convertible<B2, Base>::type* = 0 )
-      : DataIterator::iterator_adaptor_(other.base()) {}
+      : DataIterator::iterator_adaptor_(other.base())
+    {
+      BOOST_CONCEPT_ASSERT((DataIteratorConcept<Base>));
+    }
 
     /**

trunk/yat/utility/WeightIterator.h

@@ -24 +24 @@
 */
 
+#include "concept_check.h"
 #include "iterator_traits.h"
 
@@ -57 +58 @@
      \endcode
 
-    Type Requirement: \c BASE must be a \readable_iterator
+    Type Requirement:
+    - \c BASE must model a \ref concept_data_iterator
   */
   template<typename Base>
@@ -79 +81 @@
       : WeightIterator::iterator_adaptor_() 
     {
-      BOOST_CONCEPT_ASSERT((boost_concepts::ReadableIterator<Base>));
+      BOOST_CONCEPT_ASSERT((DataIteratorConcept<Base>));
     }
 
@@ -88 +90 @@
       : WeightIterator::iterator_adaptor_(b)
     {
-      BOOST_CONCEPT_ASSERT((boost_concepts::ReadableIterator<Base>));
+      BOOST_CONCEPT_ASSERT((DataIteratorConcept<Base>));
     }
 
@@ -102 +104 @@
     WeightIterator(WeightIterator<B2> other,
                    typename boost::enable_if_convertible<B2, Base>::type* = 0 )
-      : WeightIterator::iterator_adaptor_(other.base()) {}
+      : WeightIterator::iterator_adaptor_(other.base())
+    {
+      BOOST_CONCEPT_ASSERT((boost_concepts::ReadableIterator<Base>));
+    }
 
     /**