1.1 --- a/src/test/graph_wrapper_test.cc	Mon Nov 15 16:39:55 2004 +0000
     1.2 +++ b/src/test/graph_wrapper_test.cc	Tue Nov 16 13:03:47 2004 +0000
     1.3 @@ -42,26 +42,26 @@
     1.4  int main() 
     1.5  {
     1.6    {
     1.7 -    checkConcept<StaticGraph, GraphWrapper<StaticGraph> >();
     1.8 +    typedef StaticGraph Graph;
     1.9 +    checkConcept<StaticGraph, GraphWrapper<Graph> >();
    1.10  
    1.11 -    checkConcept<StaticGraph, RevGraphWrapper<StaticGraph> >();
    1.12 +    checkConcept<StaticGraph, RevGraphWrapper<Graph> >();
    1.13  
    1.14 -    checkConcept<StaticGraph, SubGraphWrapper<StaticGraph, 
    1.15 -      StaticGraph::NodeMap<bool> , StaticGraph::EdgeMap<bool> > >();
    1.16 -    checkConcept<StaticGraph, NodeSubGraphWrapper<StaticGraph, 
    1.17 -      StaticGraph::NodeMap<bool> > >();
    1.18 -    checkConcept<StaticGraph, EdgeSubGraphWrapper<StaticGraph, 
    1.19 -      StaticGraph::EdgeMap<bool> > >();
    1.20 +    checkConcept<StaticGraph, SubGraphWrapper<Graph, 
    1.21 +      Graph::NodeMap<bool> , Graph::EdgeMap<bool> > >();
    1.22 +    checkConcept<StaticGraph, NodeSubGraphWrapper<Graph, 
    1.23 +      Graph::NodeMap<bool> > >();
    1.24 +    checkConcept<StaticGraph, EdgeSubGraphWrapper<Graph, 
    1.25 +      Graph::EdgeMap<bool> > >();
    1.26      
    1.27 -    checkConcept<StaticGraph, SubBidirGraphWrapper<StaticGraph, 
    1.28 -      StaticGraph::EdgeMap<bool>, StaticGraph::EdgeMap<bool> > >();
    1.29 +    checkConcept<StaticGraph, SubBidirGraphWrapper<Graph, 
    1.30 +      Graph::EdgeMap<bool>, Graph::EdgeMap<bool> > >();
    1.31 +    checkConcept<StaticGraph, BidirGraph<Graph> >();
    1.32 +    checkConcept<StaticGraph, ResGraphWrapper<Graph, int, 
    1.33 +      Graph::EdgeMap<int>, Graph::EdgeMap<int> > >();
    1.34  
    1.35 -    checkConcept<StaticGraph, BidirGraph<StaticGraph> >();
    1.36 -
    1.37 -    checkConcept<StaticGraph, ResGraphWrapper<StaticGraph, int, 
    1.38 -      StaticGraph::EdgeMap<int>, StaticGraph::EdgeMap<int> > >();
    1.39 -
    1.40 -//     function_requires<StaticGraphConcept<ErasingFirstGraphWrapper<Graph, Graph::NodeMap<Graph::Edge> > > >();
    1.41 +    checkConcept<StaticGraph, ErasingFirstGraphWrapper<Graph, 
    1.42 +      Graph::NodeMap<Graph::Edge> > >(); 
    1.43    }
    1.44    std::cout << __FILE__ ": All tests passed.\n";
    1.45