Changeset 1685:5b37a10234bc in lemon-0.x

Timestamp:

09/16/05 11:00:18 (18 years ago)

Author:

Balazs Dezso

Branch:

default

Phase:

public

Convert:

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

Message:

Some bugfixes

Location:

lemon

Files:

• bits/alteration_notifier.h (modified) (2 diffs)
• graph_adaptor.h (modified) (1 diff)
• iterable_maps.h (modified) (2 diffs)

lemon/bits/alteration_notifier.h

@@ -81 +81 @@
       ObserverBase() : registry(0) {}
 
+      ObserverBase(const ObserverBase& copy) {
+        if (copy.attached()) {
+          copy.getRegistry()->attach(*this);
+        }
+      }
+        
       virtual ~ObserverBase() {}
 
@@ -112 +118 @@
       /// Gives back true when the observer is attached into a registry.
       bool attached() const { return registry != 0; }
-        
+
     private:
 
-      ObserverBase(const ObserverBase& copy);
       ObserverBase& operator=(const ObserverBase& copy);
 

lemon/graph_adaptor.h

@@ -680 +680 @@
   public:
     typedef SubGraphAdaptor<Graph, ConstMap<typename Graph::Node,bool>, 
-                            EdgeFilterMap> Parent;
+                            EdgeFilterMap, false> Parent;
   protected:
     ConstMap<typename Graph::Node, bool> const_true_map;

lemon/iterable_maps.h

@@ -141 +141 @@
   class IterableBoolNodeMap
   {
-    typename Graph::NodeMap<int> cmap;
-  
-  public:
-  
-    typedef IterableBoolMap<typename Graph::NodeMap<int> > BimType;
+    typename Graph::template NodeMap<int> cmap;
+  
+  public:
+  
+    typedef IterableBoolMap<typename Graph::template NodeMap<int> > BimType;
     BimType imap;
 
@@ -199 +199 @@
   class IterableBoolEdgeMap
   {
-    typename Graph::EdgeMap<int> cmap;
-  
-  public:
-  
-    typedef IterableBoolMap<typename Graph::EdgeMap<int> > BimType;
+    typename Graph::template EdgeMap<int> cmap;
+  
+  public:
+  
+    typedef IterableBoolMap<typename Graph::template EdgeMap<int> > BimType;
     BimType imap;