1.1 --- a/src/hugo/vector_map_factory.h	Fri Sep 03 15:11:17 2004 +0000
     1.2 +++ b/src/hugo/vector_map_factory.h	Fri Sep 03 15:32:03 2004 +0000
     1.3 @@ -128,11 +128,7 @@
     1.4         * The subscript operator. The map can be subscripted by the
     1.5         * actual keys of the graph. 
     1.6         */
     1.7 -<<<<<<< .mine
     1.8 -      Reference operator[](const Key& key) {
     1.9 -=======
    1.10 -      typename Container::reference operator[](const KeyType& key) {
    1.11 ->>>>>>> .r1091
    1.12 +      Reference operator[](const KeyType& key) {
    1.13  	int id = getGraph()->id(key);
    1.14  	return container[id];
    1.15        } 
    1.16 @@ -141,11 +137,7 @@
    1.17         * The const subscript operator. The map can be subscripted by the
    1.18         * actual keys of the graph. 
    1.19         */
    1.20 -<<<<<<< .mine
    1.21 -      ConstReference operator[](const Key& key) const {
    1.22 -=======
    1.23 -      typename Container::const_reference operator[](const KeyType& key) const {
    1.24 ->>>>>>> .r1091
    1.25 +      ConstReference operator[](const KeyType& key) const {
    1.26  	int id = getGraph()->id(key);
    1.27  	return container[id];
    1.28        }
    1.29 @@ -209,7 +201,7 @@
    1.30  	  friend class iterator;
    1.31  	private:
    1.32  	  Reference data;
    1.33 -	  Pointer(const KeyType& key, Value& val) : data(key, val) {}
    1.34 +	  Pointer(const KeyType& key, Map::Reference val) : data(key, val) {}
    1.35  	public:
    1.36  	  Reference* operator->() {return &data;}
    1.37  	};
    1.38 @@ -300,7 +292,8 @@
    1.39  	  friend class const_iterator;
    1.40  	private:
    1.41  	  Reference data;
    1.42 -	  Pointer(const KeyType& key, const Value& val) : data(key, val) {}
    1.43 +	  Pointer(const KeyType& key, Map::ConstReference val) 
    1.44 +	    : data(key, val) {}
    1.45  	public:
    1.46  	  Reference* operator->() {return &data;}
    1.47  	};