Changeset 799:3393abe30678 in lemon-0.x for src/hugo/vector_map_factory.h

Timestamp:

09/03/04 17:32:03 (19 years ago)

Author:

Balazs Dezso

Branch:

default

Phase:

public

Convert:

svn:c9d7d8f5-90d6-0310-b91f-818b3a526b0e/lemon/trunk@1093

Message:

 

File:

• src/hugo/vector_map_factory.h (modified) (4 diffs)

src/hugo/vector_map_factory.h

@@ -129 +129 @@
        * 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];
@@ -142 +138 @@
        * 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];
@@ -210 +202 @@
         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;}
@@ -301 +293 @@
         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;}