diff -r e997802b855c -r 87f7c54892df src/lemon/vector_map.h --- a/src/lemon/vector_map.h Sat Nov 13 12:53:28 2004 +0000 +++ b/src/lemon/vector_map.h Sat Nov 13 17:07:10 2004 +0000 @@ -53,7 +53,7 @@ /// The graph type of the map. typedef _Graph Graph; /// The key type of the map. - typedef _Item KeyType; + typedef _Item Key; /// The id map type of the map. typedef AlterationObserverRegistry<_Item> Registry; /// The value type of the map. @@ -71,19 +71,17 @@ public: - /// The value type of the map. - typedef Value ValueType; /// The reference type of the map; - typedef typename Container::reference ReferenceType; + typedef typename Container::reference Reference; /// The pointer type of the map; - typedef typename Container::pointer PointerType; + typedef typename Container::pointer Pointer; /// The const value type of the map. - typedef const Value ConstValueType; + typedef const Value ConstValue; /// The const reference type of the map; - typedef typename Container::const_reference ConstReferenceType; + typedef typename Container::const_reference ConstReference; /// The pointer type of the map; - typedef typename Container::const_pointer ConstPointerType; + typedef typename Container::const_pointer ConstPointer; /// Constructor to attach the new map into the registry. @@ -150,7 +148,7 @@ /// The subscript operator. The map can be subscripted by the /// actual items of the graph. - ReferenceType operator[](const KeyType& key) { + Reference operator[](const Key& key) { return container[graph->id(key)]; } @@ -159,7 +157,7 @@ /// The const subscript operator. The map can be subscripted by the /// actual items of the graph. - ConstReferenceType operator[](const KeyType& key) const { + ConstReference operator[](const Key& key) const { return container[graph->id(key)]; } @@ -169,7 +167,7 @@ /// It the same as operator[](key) = value expression. /// - void set(const KeyType& key, const ValueType& value) { + void set(const Key& key, const Value& value) { (*this)[key] = value; } @@ -178,7 +176,7 @@ /// It adds a new key to the map. It called by the observer registry /// and it overrides the add() member function of the observer base. - void add(const KeyType& key) { + void add(const Key& key) { int id = graph->id(key); if (id >= (int)container.size()) { container.resize(id + 1); @@ -189,7 +187,7 @@ /// Erase a key from the map. It called by the observer registry /// and it overrides the erase() member function of the observer base. - void erase(const KeyType&) {} + void erase(const Key&) {} /// Buildes the map.