1.1 --- a/src/lemon/vector_map.h	Sat Nov 13 12:53:28 2004 +0000
     1.2 +++ b/src/lemon/vector_map.h	Sat Nov 13 17:07:10 2004 +0000
     1.3 @@ -53,7 +53,7 @@
     1.4      /// The graph type of the map. 
     1.5      typedef _Graph Graph;
     1.6      /// The key type of the map.
     1.7 -    typedef _Item KeyType;
     1.8 +    typedef _Item Key;
     1.9      /// The id map type of the map.
    1.10      typedef AlterationObserverRegistry<_Item> Registry;
    1.11      /// The value type of the map.
    1.12 @@ -71,19 +71,17 @@
    1.13  
    1.14    public:
    1.15  
    1.16 -    /// The value type of the map.
    1.17 -    typedef Value ValueType;
    1.18      /// The reference type of the map;
    1.19 -    typedef typename Container::reference ReferenceType;
    1.20 +    typedef typename Container::reference Reference;
    1.21      /// The pointer type of the map;
    1.22 -    typedef typename Container::pointer PointerType;
    1.23 +    typedef typename Container::pointer Pointer;
    1.24  
    1.25      /// The const value type of the map.
    1.26 -    typedef const Value ConstValueType;
    1.27 +    typedef const Value ConstValue;
    1.28      /// The const reference type of the map;
    1.29 -    typedef typename Container::const_reference ConstReferenceType;
    1.30 +    typedef typename Container::const_reference ConstReference;
    1.31      /// The pointer type of the map;
    1.32 -    typedef typename Container::const_pointer ConstPointerType;
    1.33 +    typedef typename Container::const_pointer ConstPointer;
    1.34  
    1.35      /// Constructor to attach the new map into the registry.
    1.36  
    1.37 @@ -150,7 +148,7 @@
    1.38      /// The subscript operator. The map can be subscripted by the
    1.39      /// actual items of the graph. 
    1.40       
    1.41 -    ReferenceType operator[](const KeyType& key) {
    1.42 +    Reference operator[](const Key& key) {
    1.43        return container[graph->id(key)];
    1.44      } 
    1.45  		
    1.46 @@ -159,7 +157,7 @@
    1.47      /// The const subscript operator. The map can be subscripted by the
    1.48      /// actual items of the graph. 
    1.49       
    1.50 -    ConstReferenceType operator[](const KeyType& key) const {
    1.51 +    ConstReference operator[](const Key& key) const {
    1.52        return container[graph->id(key)];
    1.53      }
    1.54  
    1.55 @@ -169,7 +167,7 @@
    1.56      /// It the same as operator[](key) = value expression.
    1.57      ///
    1.58       
    1.59 -    void set(const KeyType& key, const ValueType& value) {
    1.60 +    void set(const Key& key, const Value& value) {
    1.61        (*this)[key] = value;
    1.62      }
    1.63  
    1.64 @@ -178,7 +176,7 @@
    1.65      /// It adds a new key to the map. It called by the observer registry
    1.66      /// and it overrides the add() member function of the observer base.
    1.67       
    1.68 -    void add(const KeyType& key) {
    1.69 +    void add(const Key& key) {
    1.70        int id = graph->id(key);
    1.71        if (id >= (int)container.size()) {
    1.72  	container.resize(id + 1);
    1.73 @@ -189,7 +187,7 @@
    1.74  		
    1.75      /// Erase a key from the map. It called by the observer registry
    1.76      /// and it overrides the erase() member function of the observer base.     
    1.77 -    void erase(const KeyType&) {}
    1.78 +    void erase(const Key&) {}
    1.79  
    1.80      /// Buildes the map.
    1.81