diff -r 6d1abeb62dd3 -r 3393abe30678 src/hugo/vector_map_factory.h
--- a/src/hugo/vector_map_factory.h	Fri Sep 03 15:11:17 2004 +0000
+++ b/src/hugo/vector_map_factory.h	Fri Sep 03 15:32:03 2004 +0000
@@ -128,11 +128,7 @@
        * The subscript operator. The map can be subscripted by the
        * actual keys of the graph. 
        */
-<<<<<<< .mine
-      Reference operator[](const Key& key) {
-=======
-      typename Container::reference operator[](const KeyType& key) {
->>>>>>> .r1091
+      Reference operator[](const KeyType& key) {
 	int id = getGraph()->id(key);
 	return container[id];
       } 
@@ -141,11 +137,7 @@
        * The const subscript operator. The map can be subscripted by the
        * actual keys of the graph. 
        */
-<<<<<<< .mine
-      ConstReference operator[](const Key& key) const {
-=======
-      typename Container::const_reference operator[](const KeyType& key) const {
->>>>>>> .r1091
+      ConstReference operator[](const KeyType& key) const {
 	int id = getGraph()->id(key);
 	return container[id];
       }
@@ -209,7 +201,7 @@
 	  friend class iterator;
 	private:
 	  Reference data;
-	  Pointer(const KeyType& key, Value& val) : data(key, val) {}
+	  Pointer(const KeyType& key, Map::Reference val) : data(key, val) {}
 	public:
 	  Reference* operator->() {return &data;}
 	};
@@ -300,7 +292,8 @@
 	  friend class const_iterator;
 	private:
 	  Reference data;
-	  Pointer(const KeyType& key, const Value& val) : data(key, val) {}
+	  Pointer(const KeyType& key, Map::ConstReference val) 
+	    : data(key, val) {}
 	public:
 	  Reference* operator->() {return &data;}
 	};