Merge
authorAlpar Juttner <alpar@cs.elte.hu>
Mon, 07 Jan 2008 19:44:18 +0100
changeset 447bbd94715db5
parent 42 3a98515e9bc3
parent 43 17e76967c49f
child 49 9a556af88710
Merge
lemon/maps.h
     1.1 --- a/lemon/maps.h	Mon Jan 07 19:27:17 2008 +0100
     1.2 +++ b/lemon/maps.h	Mon Jan 07 19:44:18 2008 +0100
     1.3 @@ -115,11 +115,6 @@
     1.4      }    
     1.5  
     1.6      template<typename T1>
     1.7 -    struct rebind {
     1.8 -      typedef ConstMap<K, T1> other;
     1.9 -    };
    1.10 -
    1.11 -    template<typename T1>
    1.12      ConstMap(const ConstMap<K, T1> &, const T &_v) : v(_v) {}
    1.13    };
    1.14  
    1.15 @@ -243,10 +238,6 @@
    1.16        _map.clear();
    1.17      }    
    1.18  
    1.19 -    template <typename T1, typename C1 = std::less<T1> >
    1.20 -    struct rebind {
    1.21 -      typedef StdMap<Key, T1, C1> other;
    1.22 -    };
    1.23    };
    1.24  
    1.25    /// \brief Map for storing values for keys from the range <tt>[0..size-1]</tt>
    1.26 @@ -392,7 +383,7 @@
    1.27  
    1.28    ///Simple wrapping of a map
    1.29  
    1.30 -  ///This \c concepts::ReadMap "read only map" returns the simple
    1.31 +  ///This \ref concepts::ReadMap "read only map" returns the simple
    1.32    ///wrapping of the given map. Sometimes the reference maps cannot be
    1.33    ///combined with simple read maps. This map adaptor wraps the given
    1.34    ///map to simple read map.
    1.35 @@ -415,9 +406,9 @@
    1.36      Value operator[](Key k) const {return m[k];}
    1.37    };
    1.38  
    1.39 -  ///Simple writable wrapping of the map
    1.40 +  ///Simple writable wrapping of a map
    1.41  
    1.42 -  ///This \c concepts::WriteMap "write map" returns the simple
    1.43 +  ///This \ref concepts::WriteMap "write map" returns the simple
    1.44    ///wrapping of the given map. Sometimes the reference maps cannot be
    1.45    ///combined with simple read-write maps. This map adaptor wraps the
    1.46    ///given map to simple read-write map.
    1.47 @@ -1553,7 +1544,7 @@
    1.48        return counter;
    1.49      }
    1.50  
    1.51 -    /// Setter function of the map
    1.52 +    /// The \c set function of the map
    1.53      void set(const Key& key, Value value) {
    1.54        if (value) {
    1.55  	map.set(key, counter++);