[Lemon-commits] [lemon_svn] klao: r1934 - hugo/trunk/lemon

[Lemon SVN]

Author: klao
Date: Wed Jun  8 22:52:18 2005
New Revision: 1934

Modified:
   hugo/trunk/lemon/graph_utils.h

Log:
Bugfixes to compile w. gcc 4.0.0

Modified: hugo/trunk/lemon/graph_utils.h
==============================================================================
--- hugo/trunk/lemon/graph_utils.h	(original)
+++ hugo/trunk/lemon/graph_utils.h	Wed Jun  8 22:52:18 2005
@@ -863,9 +863,9 @@
   ///
   template <typename _Graph>
   class InDegMap  :
-    protected _Graph::AlterationNotifier<typename _Graph::Node>::
+    protected _Graph::template AlterationNotifier<typename _Graph::Node>::
     ObserverBase,
-    protected _Graph::AlterationNotifier<typename _Graph::Edge>::
+    protected _Graph::template AlterationNotifier<typename _Graph::Edge>::
     ObserverBase
   {
     typename _Graph::template NodeMap<int> deg;
@@ -879,21 +879,21 @@
     /// Constructor for creating in-degree map.
     InDegMap(const _Graph& _graph) : graph(_graph), deg(graph,0)
     {
-      typename _Graph::AlterationNotifier<typename _Graph::Node>::ObserverBase::
-	attach(graph->getNotifier(typename _Graph::Node()));
-      typename _Graph::AlterationNotifier<typename _Graph::Edge>::ObserverBase::
-	attach(graph->getNotifier(typename _Graph::Edge()));
+      typename _Graph::template AlterationNotifier<typename _Graph::Node>
+	::ObserverBase::attach(graph->getNotifier(typename _Graph::Node()));
+      typename _Graph::template AlterationNotifier<typename _Graph::Edge>
+	::ObserverBase::attach(graph->getNotifier(typename _Graph::Edge()));
 
-      for(typename _Graph::NodeIt n(g);n!=INVALID;++n)
-	for(typename _Graph::InEdgeIt e(g,n);e!=INVALID;++e)
+      for(typename _Graph::NodeIt n(graph);n!=INVALID;++n)
+	for(typename _Graph::InEdgeIt e(graph,n);e!=INVALID;++e)
 	  deg[e]++;
     }
 
     ~InDegMap() 
     {
-      typename _Graph::AlterationNotifier<typename _Graph::Node>::
+      typename _Graph::template AlterationNotifier<typename _Graph::Node>::
 	ObserverBase::detach();
-      typename _Graph::AlterationNotifier<typename _Graph::Edge>::
+      typename _Graph::template AlterationNotifier<typename _Graph::Edge>::
 	ObserverBase::detach();
     }
     
@@ -904,15 +904,14 @@
     virtual void add(const typename _Graph::Node& n) {
       ///\bug Which 'add' comes before to other?
       deg[n]=0;
-    };
+    }
     virtual void erase(const typename _Graph::Node&) 
     {
     }
-    virtual void add(const typename _Graph::Edge& n) {
+    virtual void add(const typename _Graph::Edge& e) {
       deg[graph.target(e)]++;
-    };
-    virtual void erase(const typename _Graph::Edge&) 
-    {
+    }
+    virtual void erase(const typename _Graph::Edge& e) {
       deg[graph.target(e)]--;
     }