Changeset 1454:e0177bbe75a9 in lemon-0.x

Timestamp:

06/08/05 22:52:18 (19 years ago)

Author:

Mihaly Barasz

Branch:

default

Phase:

public

Convert:

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

Message:

Bugfixes to compile w. gcc 4.0.0

File:

• lemon/graph_utils.h (modified) (4 diffs)

lemon/graph_utils.h

@@ -864 +864 @@
   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
   {
@@ -880 +880 @@
     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()));
-
-      for(typename _Graph::NodeIt n(g);n!=INVALID;++n)
-        for(typename _Graph::InEdgeIt e(g,n);e!=INVALID;++e)
+      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(graph);n!=INVALID;++n)
+        for(typename _Graph::InEdgeIt e(graph,n);e!=INVALID;++e)
           deg[e]++;
     }
@@ -892 +892 @@
     ~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();
     }
@@ -905 +905 @@
       ///\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)]--;
     }