diff -r 08c8db58080e -r e0177bbe75a9 lemon/graph_utils.h --- a/lemon/graph_utils.h Wed Jun 08 16:36:01 2005 +0000 +++ b/lemon/graph_utils.h Wed Jun 08 20:52:18 2005 +0000 @@ -863,9 +863,9 @@ /// template class InDegMap : - protected _Graph::AlterationNotifier:: + protected _Graph::template AlterationNotifier:: ObserverBase, - protected _Graph::AlterationNotifier:: + protected _Graph::template AlterationNotifier:: ObserverBase { typename _Graph::template NodeMap deg; @@ -879,21 +879,21 @@ /// Constructor for creating in-degree map. InDegMap(const _Graph& _graph) : graph(_graph), deg(graph,0) { - typename _Graph::AlterationNotifier::ObserverBase:: - attach(graph->getNotifier(typename _Graph::Node())); - typename _Graph::AlterationNotifier::ObserverBase:: - attach(graph->getNotifier(typename _Graph::Edge())); + typename _Graph::template AlterationNotifier + ::ObserverBase::attach(graph->getNotifier(typename _Graph::Node())); + typename _Graph::template AlterationNotifier + ::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::template AlterationNotifier:: ObserverBase::detach(); - typename _Graph::AlterationNotifier:: + typename _Graph::template AlterationNotifier:: 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)]--; }