diff -r a9b0863c2265 -r d7b3b13b9df6 src/hugo/vector_map_factory.h
--- a/src/hugo/vector_map_factory.h	Thu Sep 02 15:13:21 2004 +0000
+++ b/src/hugo/vector_map_factory.h	Thu Sep 02 15:21:13 2004 +0000
@@ -30,7 +30,7 @@
     /// The graph type of the maps. 
     typedef typename MapRegistry::Graph Graph;
     /// The key type of the maps.
-    typedef typename MapRegistry::Key Key;
+    typedef typename MapRegistry::KeyType KeyType;
     /// The iterator to iterate on the keys.
     typedef typename MapRegistry::KeyIt KeyIt;
 
@@ -112,7 +112,7 @@
        * The subscript operator. The map can be subscripted by the
        * actual keys of the graph. 
        */
-      typename Container::reference operator[](const Key& key) {
+      typename Container::reference operator[](const KeyType& key) {
 	int id = getGraph()->id(key);
 	return container[id];
       } 
@@ -121,7 +121,7 @@
        * The const subscript operator. The map can be subscripted by the
        * actual keys of the graph. 
        */
-      typename Container::const_reference operator[](const Key& key) const {
+      typename Container::const_reference operator[](const KeyType& key) const {
 	int id = getGraph()->id(key);
 	return container[id];
       }
@@ -129,14 +129,14 @@
       /** Setter function of the map. Equivalent with map[key] = val.
        *  This is a compatibility feature with the not dereferable maps.
        */
-      void set(const Key& key, const Value& val) {
+      void set(const KeyType& key, const Value& val) {
 	int id = getGraph()->id(key);
 	container[id] = val;
       }
 		
       /** Add a new key to the map. It called by the map registry.
        */
-      void add(const Key& key) {
+      void add(const KeyType& key) {
 	int id = getGraph()->id(key);
 	if (id >= container.size()) {
 	  container.resize(id + 1);
@@ -145,7 +145,7 @@
 		
       /** Erase a key from the map. It called by the map registry.
        */
-      void erase(const Key& key) {}
+      void erase(const KeyType& key) {}
 
       /** Clear the data structure.
        */
@@ -172,7 +172,7 @@
 	 */
 	iterator() {}
 
-	typedef extended_pair<const Key&, const Key&, 
+	typedef extended_pair<const KeyType&, const KeyType&, 
 			      Value&, Value&> Reference;
 
 	/** Dereference operator for map.
@@ -185,7 +185,7 @@
 	  friend class iterator;
 	private:
 	  Reference data;
-	  Pointer(const Key& key, Value& val) : data(key, val) {}
+	  Pointer(const KeyType& key, Value& val) : data(key, val) {}
 	public:
 	  Reference* operator->() {return &data;}
 	};
@@ -262,7 +262,7 @@
 	 */
 	const_iterator(iterator p_it) : map(p_it.map), it(p_it.it) {}
       
-	typedef extended_pair<const Key&, const Key&, 
+	typedef extended_pair<const KeyType&, const KeyType&, 
 	  const Value&, const Value&> Reference;
 
 	/** Dereference operator for map.
@@ -276,7 +276,7 @@
 	  friend class const_iterator;
 	private:
 	  Reference data;
-	  Pointer(const Key& key, const Value& val) : data(key, val) {}
+	  Pointer(const KeyType& key, const Value& val) : data(key, val) {}
 	public:
 	  Reference* operator->() {return &data;}
 	};