diff -r a9b0863c2265 -r d7b3b13b9df6 src/hugo/array_map_factory.h
--- a/src/hugo/array_map_factory.h	Thu Sep 02 15:13:21 2004 +0000
+++ b/src/hugo/array_map_factory.h	Thu Sep 02 15:21:13 2004 +0000
@@ -22,7 +22,7 @@
   public:
 		
     typedef typename MapRegistry::Graph Graph;
-    typedef typename MapRegistry::Key Key;
+    typedef typename MapRegistry::KeyType KeyType;
     typedef typename MapRegistry::KeyIt KeyIt;
 
     typedef typename MapRegistry::MapBase MapBase;
@@ -113,27 +113,27 @@
       }
 	
 	
-      Value& operator[](const Key& key) {
+      Value& operator[](const KeyType& key) {
 	int id = MapBase::getGraph()->id(key);
 	return values[id];
       } 
 		
-      const Value& operator[](const Key& key) const {
+      const Value& operator[](const KeyType& key) const {
 	int id = MapBase::getGraph()->id(key);
 	return values[id];
       }
 	
-      const Value& get(const Key& key) const {
+      const Value& get(const KeyType& key) const {
 	int id = MapBase::getGraph()->id(key);
 	return values[id];
       } 
 		
-      void set(const Key& key, const Value& val) {
+      void set(const KeyType& key, const Value& val) {
 	int id = MapBase::getGraph()->id(key);
 	values[id] = val;
       }
 		
-      void add(const Key& key) {
+      void add(const KeyType& key) {
 	int id = MapBase::getGraph()->id(key);
 	if (id >= capacity) {
 	  int new_capacity = (capacity == 0 ? 1 : capacity);
@@ -155,7 +155,7 @@
 	allocator.construct(&(values[id]), Value());
       }
 		
-      void erase(const Key& key) {
+      void erase(const KeyType& key) {
 	int id = MapBase::getGraph()->id(key);
 	allocator.destroy(&(values[id]));
       }
@@ -184,7 +184,7 @@
 	 */
 	iterator() {}
 
-	typedef extended_pair<const Key&, const Key&, 
+	typedef extended_pair<const KeyType&, const KeyType&, 
 			      Value&, Value&> Reference;
 
 	/** Dereference operator for map.
@@ -197,7 +197,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;}
 	};
@@ -274,7 +274,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.
@@ -288,7 +288,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;}
 	};