diff -r 02971275e7bf -r 5222a3c470ed lemon/bpugraph_adaptor.h --- a/lemon/bpugraph_adaptor.h Tue Jul 22 11:20:06 2008 +0000 +++ b/lemon/bpugraph_adaptor.h Tue Jul 22 11:29:57 2008 +0000 @@ -156,11 +156,11 @@ int id(const Edge& e) const { return graph->id(e); } int id(const UEdge& e) const { return graph->id(e); } - Node fromNodeId(int ix) const { return graph->fromNodeId(ix); } + Node nodeFromId(int ix) const { return graph->nodeFromId(ix); } ANode nodeFromANodeId(int ix) const { return graph->nodeFromANodeId(ix); } BNode nodeFromBNodeId(int ix) const { return graph->nodeFromBNodeId(ix); } - Edge fromEdgeId(int ix) const { return graph->fromEdgeId(ix); } - UEdge fromUEdgeId(int ix) const { return graph->fromUEdgeId(ix); } + Edge edgeFromId(int ix) const { return graph->edgeFromId(ix); } + UEdge uEdgeFromId(int ix) const { return graph->uEdgeFromId(ix); } int maxNodeId() const { return graph->maxNodeId(); } int maxANodeId() const { return graph->maxANodeId(); }