diff -r c2992fd74dad -r a954b780e3ab lemon/graph_adaptor.h --- a/lemon/graph_adaptor.h Wed Feb 22 18:26:56 2006 +0000 +++ b/lemon/graph_adaptor.h Thu Feb 23 08:55:54 2006 +0000 @@ -698,13 +698,13 @@ }; template - class UndirectGraphAdaptorBase : + class UndirGraphAdaptorBase : public UGraphBaseExtender > { public: typedef _Graph Graph; typedef UGraphBaseExtender > Parent; protected: - UndirectGraphAdaptorBase() : Parent() { } + UndirGraphAdaptorBase() : Parent() { } public: typedef typename Parent::UEdge UEdge; typedef typename Parent::Edge Edge; @@ -712,17 +712,17 @@ template class EdgeMap { protected: - const UndirectGraphAdaptorBase<_Graph>* g; + const UndirGraphAdaptorBase<_Graph>* g; template friend class EdgeMap; typename _Graph::template EdgeMap forward_map, backward_map; public: typedef T Value; typedef Edge Key; - EdgeMap(const UndirectGraphAdaptorBase<_Graph>& _g) : g(&_g), + EdgeMap(const UndirGraphAdaptorBase<_Graph>& _g) : g(&_g), forward_map(*(g->graph)), backward_map(*(g->graph)) { } - EdgeMap(const UndirectGraphAdaptorBase<_Graph>& _g, T a) : g(&_g), + EdgeMap(const UndirGraphAdaptorBase<_Graph>& _g, T a) : g(&_g), forward_map(*(g->graph), a), backward_map(*(g->graph), a) { } void set(Edge e, T a) { @@ -748,10 +748,10 @@ typedef T Value; typedef UEdge Key; - UEdgeMap(const UndirectGraphAdaptorBase<_Graph>& g) : + UEdgeMap(const UndirGraphAdaptorBase<_Graph>& g) : map(*(g.graph)) { } - UEdgeMap(const UndirectGraphAdaptorBase<_Graph>& g, T a) : + UEdgeMap(const UndirGraphAdaptorBase<_Graph>& g, T a) : map(*(g.graph), a) { } void set(UEdge e, T a) { @@ -773,17 +773,17 @@ /// /// \author Marton Makai template - class UndirectGraphAdaptor : + class UndirGraphAdaptor : public UGraphAdaptorExtender< - UndirectGraphAdaptorBase<_Graph> > { + UndirGraphAdaptorBase<_Graph> > { public: typedef _Graph Graph; typedef UGraphAdaptorExtender< - UndirectGraphAdaptorBase<_Graph> > Parent; + UndirGraphAdaptorBase<_Graph> > Parent; protected: - UndirectGraphAdaptor() { } + UndirGraphAdaptor() { } public: - UndirectGraphAdaptor(_Graph& _graph) { + UndirGraphAdaptor(_Graph& _graph) { setGraph(_graph); } };