Changeset 2068

Timestamp:

Sep 17, 2009, 11:12:21 PM (14 years ago)

Author:

Peter

Message:

fixes #562

Location:

trunk

Files:

• NEWS (modified) (1 diff)
• test/iterator_test.cc (modified) (4 diffs)
• yat/utility/stl_utility.h (modified) (3 diffs)

trunk/NEWS

@@ -5 +5 @@
 Version 0.6 (released DATE)
 
+  - pair_first_iterator and pair_second_iterator now work with
+    const_iterator (ticket:562)
   - Passing by const& in KolmogorovSmirnov::Element::operator< (r2064)
   - classes OptionInFile and OptionOutFile are deprecated (ticket:521)

trunk/test/iterator_test.cc

@@ -45 +45 @@
 #include <fstream>
 #include <iterator>
+#include <map>
+#include <set>
 #include <string>
 #include <vector>
@@ -59 +61 @@
 
 void test_boost_util(test::Suite&);
+void test_pair_second_iterator(test::Suite&);
 
 void test_stride_iterator(test::Suite& suite);
@@ -72 +75 @@
   old_main(suite);
   test_boost_util(suite);
+  test_pair_second_iterator(suite);
   test_weighted_iterator(suite);
   return suite.return_value();
@@ -360 +364 @@
 }
 
+void test_pair_second_iterator(test::Suite& suite)
+{
+  typedef std::map<std::string, std::string> C;
+  C person2color;
+  person2color["me"] = "yellow";
+  person2color["you"] = "orange";
+
+  C::const_iterator cbegin = person2color.begin();
+  C::const_iterator cend = person2color.end();
+
+  std::set<std::string> colors;
+  colors.insert(utility::pair_second_iterator(cbegin), 
+               utility::pair_second_iterator(cend));
+
+  suite.test_bidirectional_iterator(utility::pair_second_iterator(cbegin));
+  suite.test_bidirectional_iterator(utility::pair_first_iterator(cbegin));
+}

trunk/yat/utility/stl_utility.h

@@ -39 +39 @@
 #include <boost/iterator/transform_iterator.hpp>
 #include <boost/mpl/if.hpp>
+#include <boost/type_traits/add_const.hpp>
 #include <boost/type_traits/is_const.hpp>
-#include <boost/type_traits/add_const.hpp>
+#include <boost/type_traits/remove_reference.hpp>
 
 #include <algorithm>
@@ -432 +433 @@
   template<class Iter>
   boost::transform_iterator<
-    PairFirst<typename std::iterator_traits<Iter>::value_type>, 
+    PairFirst<typename boost::remove_reference<
+                 typename std::iterator_traits<Iter>::reference
+                 >::type>,
     Iter> pair_first_iterator(Iter i)
   {
-    typedef PairFirst<typename std::iterator_traits<Iter>::value_type> PF; 
+    // We are going via ::reference in order to remain const info;
+    // ::value_type does not contain const information.
+    typedef typename std::iterator_traits<Iter>::reference ref_type;
+    typedef typename boost::remove_reference<ref_type>::type val_type;
+    typedef PairFirst<val_type> PF; 
     return boost::transform_iterator<PF, Iter>(i, PF());
   }
@@ -457 +464 @@
   template<class Iter>
   boost::transform_iterator<
-    PairSecond<typename std::iterator_traits<Iter>::value_type>, 
+    PairSecond<typename boost::remove_reference<
+                 typename std::iterator_traits<Iter>::reference
+                 >::type>,
     Iter> pair_second_iterator(Iter i)
   {
-    typedef PairSecond<typename std::iterator_traits<Iter>::value_type> PF; 
-    return boost::transform_iterator<PF, Iter>(i, PF());
+    // We are going via ::reference in order to remain const info;
+    // ::value_type does not contain const information.
+    typedef typename std::iterator_traits<Iter>::reference ref_type;
+    typedef typename boost::remove_reference<ref_type>::type val_type;
+    typedef PairSecond<val_type> PS; 
+    return boost::transform_iterator<PS, Iter>(i, PS());
   }