LEMON/LEMON-official Changeset - r866:2e9655402778

Repositories » LEMON » LEMON-official

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

Changeset - r866:2e9655402778

« 865:e9c203
« 552:bfe837

893:cf0c1b »

r866:2e9655402778

Thu, 10 Dec 2009 16:56:26

[Not Reviewed]

0 comments (0 inline)

alpar (Alpar Juttner)
alpar@cs.elte.hu

Merge bugfix #330 to branch 1.0

0 1 0

merge 1.0

0 files changed with 48 insertions and 48 deletions:

lemon/bits/map_extender.h

↑ Collapse diff ↑

lemon/bits/map_extender.h

Show inline comments

@@ -77,99 +77,99 @@
 		    class MapIt : public Item {
 		    public:
 		      typedef Item Parent;
 		      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;
 		    };
 		    class ConstMapIt : public Item {
 		    public:
 		      typedef Item Parent;
 		      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);
+		      }
 		      ConstMapIt(const Map& _map, const Item& item)
 		        : Parent(item), map(_map) {}
 		      ConstMapIt& operator++() {
-		        map.notifier()->next(*this);
+		        map->notifier()->next(*this);
 		        return *this;
+		      }
 		      typename MapTraits<Map>::ConstReturnValue operator*() const {
 		        return map[*this];
+		      }
 		    protected:
-		      const Map& map;
+		      const Map* map;
 		    };
 		    class ItemIt : public Item {
 		    public:
 		      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;
 		    };
 		  };
 		  // \ingroup graphbits
 		  //
@@ -221,99 +221,99 @@
 		    class MapIt : public Item {
 		    public:
 		      typedef Item Parent;
 		      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;
 		    };
 		    class ConstMapIt : public Item {
 		    public:
 		      typedef Item Parent;
 		      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;
 		    };
 		    class ItemIt : public Item {
 		    public:
 		      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;
 		    };
 		  private:
 		    const Graph& graph;

0 comments (0 inline)

RhodeCode

Login to your account