Changeset 2423:02fedd6652c6 in lemon-0.x

Timestamp:

04/19/07 17:09:08 (17 years ago)

Author:

Balazs Dezso

Branch:

default

Phase:

public

Convert:

svn:c9d7d8f5-90d6-0310-b91f-818b3a526b0e/lemon/trunk@3259

Message:

Corrections on StoreBoolMap?

• *insert_iterator has void value_type
• use const setting

File:

• lemon/maps.h (modified) (5 diffs)

lemon/maps.h

@@ -1045 +1045 @@
     return NotMap<M>(m);
   }
-
+  
   template <typename M> 
   inline NotWriteMap<M> notMap(M &m) {
@@ -1052 +1052 @@
 
   namespace _maps_bits {
+
     template <typename Value>
     struct Identity {
       typedef Value argument_type;
       typedef Value result_type;
-      Value operator()(const Value& val) {
+      Value operator()(const Value& val) const {
         return val;
       }
     };
+
+    template <typename _Iterator, typename Enable = void>
+    struct IteratorTraits {
+      typedef typename std::iterator_traits<_Iterator>::value_type Value;
+    };
+
+    template <typename _Iterator>
+    struct IteratorTraits<_Iterator,
+      typename exists<typename _Iterator::container_type>::type> 
+    {
+      typedef typename _Iterator::container_type::value_type Value;
+    };
+
   }
   
@@ -1086 +1100 @@
   ///\endcode
   template <typename _Iterator, 
-            typename _Functor = 
-            _maps_bits::Identity<typename std::iterator_traits<_Iterator>::value_type> >
+            typename _Functor =
+            _maps_bits::Identity<typename _maps_bits::
+                                 IteratorTraits<_Iterator>::Value> >
   class StoreBoolMap {
   public:
@@ -1112 +1127 @@
 
     /// Setter function of the map
-    void set(const Key& key, Value value) {
+    void set(const Key& key, Value value) const {
       if (value) {
         *_end++ = _functor(key);
@@ -1119 +1134 @@
     
   private:
-    Iterator _begin, _end;
+    Iterator _begin;
+    mutable Iterator _end;
     Functor _functor;
   };