# HG changeset patch # User marci # Date 1095767660 0 # Node ID 004636791dd7b673c38a497b1a8327b5b6b4fa3f # Parent 74589d20dbc315d543a8e02f9ffc45d7d85a4edd graph_wrappers now pass the tests. diff -r 74589d20dbc3 -r 004636791dd7 src/hugo/graph_wrapper.h --- a/src/hugo/graph_wrapper.h Mon Sep 20 22:57:48 2004 +0000 +++ b/src/hugo/graph_wrapper.h Tue Sep 21 11:54:20 2004 +0000 @@ -808,7 +808,7 @@ EdgeIt(Invalid i) : Edge(i) { } EdgeIt(const SubBidirGraphWrapper& _gw) : - Edge(typename Graph::OutEdgeIt(*(_gw.graph)), false), gw(&_gw) { + Edge(typename Graph::EdgeIt(*(_gw.graph)), false), gw(&_gw) { while (*static_cast(this)!=INVALID && !(*(gw->forward_filter))[*this]) *(static_cast(this))= diff -r 74589d20dbc3 -r 004636791dd7 src/test/graph_wrapper_test.cc --- a/src/test/graph_wrapper_test.cc Mon Sep 20 22:57:48 2004 +0000 +++ b/src/test/graph_wrapper_test.cc Tue Sep 21 11:54:20 2004 +0000 @@ -42,23 +42,23 @@ //typedef UndirGraph UndirG; //template void checkCompileStaticGraph(UndirG &); -//typedef SubBidirGraphWrapper, -/// \bug SubBidirGraphWrapper cannot pass the StaticGraph test -// Graph::EdgeMap > SubBDGW; -//template void checkCompileStaticGraph(SubBDGW &); +//Compile SubBidirGraphWrapper +typedef SubBidirGraphWrapper, + Graph::EdgeMap > SubBDGW; +template void checkCompileStaticGraph(SubBDGW &); //Compile BidirGraphWrapper -//typedef BidirGraphWrapper BidirGW; -//template void checkCompileStaticGraph(BidirGW &); +typedef BidirGraphWrapper BidirGW; +template void checkCompileStaticGraph(BidirGW &); //Compile BidirGraph -//typedef BidirGraph BidirG; -//template void checkCompileStaticGraph(BidirG &); +typedef BidirGraph BidirG; +template void checkCompileStaticGraph(BidirG &); //Compile ResGraphWrapper -//typedef ResGraphWrapper, -// Graph::EdgeMap > ResGW; -//template void checkCompileStaticGraph(ResGW &); +typedef ResGraphWrapper, + Graph::EdgeMap > ResGW; +template void checkCompileStaticGraph(ResGW &); //Compile ErasingFirstGraphWrapper typedef ErasingFirstGraphWrapper > ErasingFirstGW;