[Lemon-commits] [lemon_svn] deba: r2207 - in hugo/trunk/lemon: . bits

[Lemon SVN]

Author: deba
Date: Fri Sep 16 11:00:18 2005
New Revision: 2207

Modified:
   hugo/trunk/lemon/bits/alteration_notifier.h
   hugo/trunk/lemon/graph_adaptor.h
   hugo/trunk/lemon/iterable_maps.h

Log:
Some bugfixes



Modified: hugo/trunk/lemon/bits/alteration_notifier.h
==============================================================================
--- hugo/trunk/lemon/bits/alteration_notifier.h	(original)
+++ hugo/trunk/lemon/bits/alteration_notifier.h	Fri Sep 16 11:00:18 2005
@@ -80,6 +80,12 @@
       /// 
       ObserverBase() : registry(0) {}
 
+      ObserverBase(const ObserverBase& copy) {
+	if (copy.attached()) {
+	  copy.getRegistry()->attach(*this);
+	}
+      }
+	
       virtual ~ObserverBase() {}
 
       /// \brief Attaches the observer into an AlterationNotifier.
@@ -111,10 +117,9 @@
       
       /// 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);
 
     protected:

Modified: hugo/trunk/lemon/graph_adaptor.h
==============================================================================
--- hugo/trunk/lemon/graph_adaptor.h	(original)
+++ hugo/trunk/lemon/graph_adaptor.h	Fri Sep 16 11:00:18 2005
@@ -679,7 +679,7 @@
 			   EdgeFilterMap, false> {
   public:
     typedef SubGraphAdaptor<Graph, ConstMap<typename Graph::Node,bool>, 
-			    EdgeFilterMap> Parent;
+			    EdgeFilterMap, false> Parent;
   protected:
     ConstMap<typename Graph::Node, bool> const_true_map;
   public:

Modified: hugo/trunk/lemon/iterable_maps.h
==============================================================================
--- hugo/trunk/lemon/iterable_maps.h	(original)
+++ hugo/trunk/lemon/iterable_maps.h	Fri Sep 16 11:00:18 2005
@@ -140,11 +140,11 @@
   template <class Graph>
   class IterableBoolNodeMap
   {
-    typename Graph::NodeMap<int> cmap;
+    typename Graph::template NodeMap<int> cmap;
   
   public:
   
-    typedef IterableBoolMap<typename Graph::NodeMap<int> > BimType;
+    typedef IterableBoolMap<typename Graph::template NodeMap<int> > BimType;
     BimType imap;
 
 
@@ -198,11 +198,11 @@
   template <class Graph>
   class IterableBoolEdgeMap
   {
-    typename Graph::EdgeMap<int> cmap;
+    typename Graph::template EdgeMap<int> cmap;
   
   public:
   
-    typedef IterableBoolMap<typename Graph::EdgeMap<int> > BimType;
+    typedef IterableBoolMap<typename Graph::template EdgeMap<int> > BimType;
     BimType imap;