LEMON/LEMON-main Changeset - r801:e9c203fb003d

Repositories » LEMON » LEMON-main

Summary
Changelog
Files
Switch To
- loading...
Options
- Lightweight changelog
- Search
Pull Requests

Changeset - r801:e9c203fb003d

« 516:c6acc3

837:f58e01 »
802:994c7d »

r801:e9c203fb003d

Fri, 13 Nov 2009 12:33:33

[Not Reviewed]

0 comments (0 inline)

kpeter (Peter Kovacs)
kpeter@inf.elte.hu

Bug fix in map_extender.h (#330)

0 1 0

default

1 file changed with 48 insertions and 48 deletions:

lemon/bits/map_extender.h

↑ Collapse diff ↑

lemon/bits/map_extender.h

Show inline comments

@@ -81,34 +81,34 @@
 		      typedef typename Map::Value Value;
 		      MapIt() {}
+		      MapIt() : map(NULL) {}
-		      MapIt(Invalid i) : Parent(i) { }
+		      MapIt(Invalid i) : Parent(i), map(NULL) {}
 		      explicit MapIt(Map& _map) : map(_map) {
 		        map.notifier()->first(*this);
 		      explicit MapIt(Map& _map) : map(&_map) {
 		        map->notifier()->first(*this);
+		      }
 		      MapIt(const Map& _map, const Item& item)
 		        : Parent(item), map(_map) {}
+		        : Parent(item), map(&_map) {}
 		      MapIt& operator++() {
-		        map.notifier()->next(*this);
+		        map->notifier()->next(*this);
 		        return *this;
+		      }
 		      typename MapTraits<Map>::ConstReturnValue operator*() const {
 		        return map[*this];
+		        return (*map)[*this];
+		      }
 		      typename MapTraits<Map>::ReturnValue operator*() {
 		        return map[*this];
+		        return (*map)[*this];
+		      }
 		      void set(const Value& value) {
-		        map.set(*this, value);
+		        map->set(*this, value);
+		      }
 		    protected:
-		      Map& map;
+		      Map* map;
 		    };
@@ -121,10 +121,10 @@
 		      typedef typename Map::Value Value;
 		      ConstMapIt() {}
+		      ConstMapIt() : map(NULL) {}
-		      ConstMapIt(Invalid i) : Parent(i) { }
+		      ConstMapIt(Invalid i) : Parent(i), map(NULL) {}
 		      explicit ConstMapIt(Map& _map) : map(_map) {
 		        map.notifier()->first(*this);
 		      explicit ConstMapIt(Map& _map) : map(&_map) {
 		        map->notifier()->first(*this);
+		      }
@@ -133,5 +133,5 @@
 		      ConstMapIt& operator++() {
-		        map.notifier()->next(*this);
+		        map->notifier()->next(*this);
 		        return *this;
+		      }
@@ -142,5 +142,5 @@
 		    protected:
-		      const Map& map;
+		      const Map* map;
 		    };
@@ -150,22 +150,22 @@
 		      typedef Item Parent;
 		      ItemIt() {}
+		      ItemIt() : map(NULL) {}
-		      ItemIt(Invalid i) : Parent(i) { }
+		      ItemIt(Invalid i) : Parent(i), map(NULL) {}
 		      explicit ItemIt(Map& _map) : map(_map) {
 		        map.notifier()->first(*this);
 		      explicit ItemIt(Map& _map) : map(&_map) {
 		        map->notifier()->first(*this);
+		      }
 		      ItemIt(const Map& _map, const Item& item)
 		        : Parent(item), map(_map) {}
+		        : Parent(item), map(&_map) {}
 		      ItemIt& operator++() {
-		        map.notifier()->next(*this);
+		        map->notifier()->next(*this);
 		        return *this;
+		      }
 		    protected:
-		      const Map& map;
+		      const Map* map;
 		    };
@@ -225,34 +225,34 @@
 		      typedef typename Map::Value Value;
 		      MapIt() {}
+		      MapIt() : map(NULL) {}
 		      MapIt(Invalid i) : Parent(i) { }
+		      MapIt(Invalid i) : Parent(i), map(NULL) { }
 		      explicit MapIt(Map& _map) : map(_map) {
 		        map.graph.first(*this);
 		      explicit MapIt(Map& _map) : map(&_map) {
 		        map->graph.first(*this);
+		      }
 		      MapIt(const Map& _map, const Item& item)
 		        : Parent(item), map(_map) {}
+		        : Parent(item), map(&_map) {}
 		      MapIt& operator++() {
-		        map.graph.next(*this);
+		        map->graph.next(*this);
 		        return *this;
+		      }
 		      typename MapTraits<Map>::ConstReturnValue operator*() const {
 		        return map[*this];
+		        return (*map)[*this];
+		      }
 		      typename MapTraits<Map>::ReturnValue operator*() {
 		        return map[*this];
+		        return (*map)[*this];
+		      }
 		      void set(const Value& value) {
-		        map.set(*this, value);
+		        map->set(*this, value);
+		      }
 		    protected:
-		      Map& map;
+		      Map* map;
 		    };
@@ -265,26 +265,26 @@
 		      typedef typename Map::Value Value;
 		      ConstMapIt() {}
+		      ConstMapIt() : map(NULL) {}
 		      ConstMapIt(Invalid i) : Parent(i) { }
+		      ConstMapIt(Invalid i) : Parent(i), map(NULL) { }
 		      explicit ConstMapIt(Map& _map) : map(_map) {
 		        map.graph.first(*this);
 		      explicit ConstMapIt(Map& _map) : map(&_map) {
 		        map->graph.first(*this);
+		      }
 		      ConstMapIt(const Map& _map, const Item& item)
 		        : Parent(item), map(_map) {}
+		        : Parent(item), map(&_map) {}
 		      ConstMapIt& operator++() {
-		        map.graph.next(*this);
+		        map->graph.next(*this);
 		        return *this;
+		      }
 		      typename MapTraits<Map>::ConstReturnValue operator*() const {
 		        return map[*this];
+		        return (*map)[*this];
+		      }
 		    protected:
-		      const Map& map;
+		      const Map* map;
 		    };
@@ -294,22 +294,22 @@
 		      typedef Item Parent;
 		      ItemIt() {}
+		      ItemIt() : map(NULL) {}
 		      ItemIt(Invalid i) : Parent(i) { }
+		      ItemIt(Invalid i) : Parent(i), map(NULL) { }
 		      explicit ItemIt(Map& _map) : map(_map) {
 		        map.graph.first(*this);
 		      explicit ItemIt(Map& _map) : map(&_map) {
 		        map->graph.first(*this);
+		      }
 		      ItemIt(const Map& _map, const Item& item)
 		        : Parent(item), map(_map) {}
+		        : Parent(item), map(&_map) {}
 		      ItemIt& operator++() {
-		        map.graph.next(*this);
+		        map->graph.next(*this);
 		        return *this;
+		      }
 		    protected:
-		      const Map& map;
+		      const Map* map;
 		    };

0 comments (0 inline)

RhodeCode

Login to your account