Changeset 3548 for trunk/yat/utility/concept_check.h

Timestamp:

Jan 1, 2017, 5:56:44 AM (6 years ago)

Author:

Peter

Message:

The concept 'Distance' now requires that operator() works on iterator
that are readable and forward traversal, i.e., the previously implicit
requirement that iterator's reference type is lvalue is
dropped. closes #873

File:

• trunk/yat/utility/concept_check.h (modified) (2 diffs)

trunk/yat/utility/concept_check.h

@@ -27 +27 @@
 
 #include "iterator_traits.h"
+#include "WeightedIteratorArchetype.h"
 
 #include <boost/concept_archetype.hpp>
 #include <boost/concept_check.hpp>
+#include <boost/iterator/iterator_archetypes.hpp>
 #include <boost/iterator/iterator_concepts.hpp>
 
@@ -281 +283 @@
     BOOST_CONCEPT_USAGE(DistanceConcept)
     {
-      boost::forward_iterator_archetype<double> unweighted;
-      boost::forward_iterator_archetype<DataWeight> weighted;
+      using boost::iterator_archetypes::readable_iterator_t;
+      using boost::forward_traversal_tag;
+      boost::iterator_archetype<double, readable_iterator_t,
+                                forward_traversal_tag> unweighted;
+      WeightedIteratorArchetype<readable_iterator_t, forward_traversal_tag>
+        weighted;
       double d=0;
       d += distance_(unweighted, unweighted, unweighted);