# HG changeset patch # User alpar # Date 1077037192 0 # Node ID 90a35f45fa6add63cd9b14d87b19668760ee4b15 # Parent 25ab81446a07af26704de46115c3ac2a7ff0d127 . diff -r 25ab81446a07 -r 90a35f45fa6a src/work/alpar/f_ed_ka.h --- a/src/work/alpar/f_ed_ka.h Tue Feb 17 14:04:46 2004 +0000 +++ b/src/work/alpar/f_ed_ka.h Tue Feb 17 16:59:52 2004 +0000 @@ -40,7 +40,7 @@ //3: it is node s typename Graph::NodeMap tree(G); - EachNodeIt gn; //FIXME: it might be too global for some people... + NodeIt gn; //FIXME: it might be too global for some people... augment: diff -r 25ab81446a07 -r 90a35f45fa6a src/work/edmonds_karp.hh --- a/src/work/edmonds_karp.hh Tue Feb 17 14:04:46 2004 +0000 +++ b/src/work/edmonds_karp.hh Tue Feb 17 16:59:52 2004 +0000 @@ -242,12 +242,14 @@ template class ResGraph3 { +public: typedef typename Graph::NodeIt NodeIt; typedef typename Graph::EachNodeIt EachNodeIt; //typedef typename Graph::SymEdgeIt OldSymEdgeIt; typedef typename Graph::OutEdgeIt OldOutEdgeIt; typedef typename Graph::InEdgeIt OldInEdgeIt; +private: const Graph& G; FlowMap& flow; const CapacityMap& capacity; diff -r 25ab81446a07 -r 90a35f45fa6a src/work/list_graph.hh --- a/src/work/list_graph.hh Tue Feb 17 14:04:46 2004 +0000 +++ b/src/work/list_graph.hh Tue Feb 17 16:59:52 2004 +0000 @@ -389,8 +389,8 @@ EachNodeIt(node_item* v) : NodeIt(v) { } EachNodeIt& operator++() { node=node->_next_node; return *this; } //FIXME:: - EachNodeIt& operator=(const NodeIt& e) - { node=e.node; return *this; } + // EachNodeIt& operator=(const NodeIt& e) + // { node=e.node; return *this; } }; class EdgeIt {