Changeset 3379

Timestamp:

Feb 13, 2015, 12:22:36 PM (8 years ago)

Author:

Peter

Message:

avoid using weighted_iterator_archetype with incrementable_traversal_tag. note, should reflect this in docs and concept checks in library as well. refs #803

Location:

trunk/test

Files:

• iterator.cc (modified) (2 diffs)
• weighted_iterator_archetype.cc (modified) (1 diff)
• weighted_iterator_archetype.h (modified) (2 diffs)

trunk/test/iterator.cc

@@ -361 +361 @@
 {
   typedef boost::iterator_archetypes::readable_iterator_t Access;
-  typedef boost::incrementable_traversal_tag Traversal;
+  typedef boost::single_pass_traversal_tag Traversal;
   if (false) {
     typedef test::weighted_iterator_archetype<Access, Traversal> I;
@@ -419 +419 @@
     // test unweighted iterator
     typedef boost::iterator_archetypes::readable_iterator_t Access;
-    typedef boost::incrementable_traversal_tag Traversal;
+    typedef boost::single_pass_traversal_tag Traversal;
     // test unweighted iterator
     {

trunk/test/weighted_iterator_archetype.cc

@@ -144 +144 @@
   // this is a compilation test - do not run
   if (false) {
-    test1<boost::incrementable_traversal_tag>();
+    //test1<boost::incrementable_traversal_tag>();
     test1<boost::single_pass_traversal_tag>();
     test1<boost::forward_traversal_tag>();

trunk/test/weighted_iterator_archetype.h

@@ -104 +104 @@
 
     TraversalCategory is one of the boost categories:
-    boost::incrementable_traversal_tag
+    // currently not working boost::incrementable_traversal_tag
     boost::single_pass_traversal_tag
     boost::forward_traversal_tag
@@ -123 +123 @@
     // constructors
     weighted_iterator_archetype(void) { is_forward(TraversalCategory()); }
-    weighted_iterator_archetype(ctor_arg arg) {}
+    weighted_iterator_archetype(ctor_arg arg)
+    {
+      // Category incrementable_traversal_tag is problematic on
+      // certain systems, so avoid usage.
+      is_single_pass(TraversalCategory());
+    }
 
     // Create an iterator from a mutable iterator, i.e., this is a