Changeset 3372

Timestamp:

Feb 11, 2015, 2:31:03 AM (8 years ago)

Author:

Peter

Message:

Fix bug in CigarIterator? that assumed BASE could be constructed from
NULL. Extend test to avoid regression.

Location:

trunk

Files:

• test/cigar_iterator.cc (modified) (3 diffs)
• yat/utility/CigarIterator.h (modified) (1 diff)

trunk/test/cigar_iterator.cc

@@ -30 +30 @@
 
 #include <cassert>
+#include <deque>
+#include <vector>
 
 using namespace theplu::yat;
@@ -87 +89 @@
   }
 
-  utility::CigarIterator<Base> iter3(cigar.begin());
+  // check default constructor
+  utility::CigarIterator<Base> iter3;
+  // check assignment
+  iter3 = utility::CigarIterator<Base>(cigar.begin());
   utility::CigarIterator<Base> iter4(cigar.begin()+3, 1);
   std::advance(iter3, oplen[0]+oplen[1]+oplen[2]+1);
@@ -98 +103 @@
     test::test_readable_iterator(iter3);
     test::test_bidirectional_traversal_iterator(iter3);
+    // test default constructor
+    utility::CigarIterator<std::deque<uint32_t>::const_iterator> iter5;
+    test::avoid_compiler_warning(iter5);
   }
 }

trunk/yat/utility/CigarIterator.h

@@ -94 +94 @@
 
   template<typename BASE>
-  CigarIterator<BASE>::CigarIterator(void)
-    : base_(NULL) {}
+  CigarIterator<BASE>::CigarIterator(void) {}