Changeset 702:4207f82a1778 in lemon-0.x for src/work/deba/vector_map_factory.h

Timestamp:

07/14/04 23:16:10 (21 years ago)

Author:

Balazs Dezso

Branch:

default

Phase:

public

Convert:

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

Message:

 

File:

• src/work/deba/vector_map_factory.h (modified) (5 diffs)

src/work/deba/vector_map_factory.h

@@ -4 +4 @@
 #include <vector>
 #include <iostream>
+
+#include "extended_pair.h"
 
 namespace hugo {
@@ -156 +158 @@
         }
 
+
+        class Pointer {
+          friend class iterator;
+        private:
+          typedef extended_pair<const Key&, const Key&, Value&, Value&> Pair;
+          Pair data;
+          Pointer(const Key& key, Value& val) : data(key, val) {}
+        public:
+          Pair* operator->() {return &data;}
+        };
+
         /** Arrow operator for map.
          */      
-        std::pair<const Key, Value>* operator->() {
-          static std::pair<const Key, Value> tmp = operator*();
-          return &tmp;
+        Pointer operator->() {
+          return Pointer(it, ((*map)[it])); 
         }
 
@@ -189 +201 @@
           return !(*this == p_it);
         }
+
         
       private:
@@ -235 +248 @@
         }
 
+        class Pointer {
+          friend class const_iterator;
+        private:
+          typedef extended_pair<const Key&, const Key&, const Value&, const Value&> Pair;
+          Pair data;
+          Pointer(const Key& key, const Value& val) : data(key, val) {}
+        public:
+          Pair* operator->() {return &data;}
+        };
         /** Arrow operator for map.
          */      
-        std::pair<const Key, const Value>* operator->() const {
-          static std::pair<const Key, const Value> tmp = operator*();
-          return &tmp;
+        Pointer operator->() const {
+          return Pointer(it, (*map)[it]);
         }
 
@@ -269 +290 @@
         }
         
+
       private:
         const Map* map;