1.1 --- a/src/test/graph_test.cc	Sat Nov 13 17:47:44 2004 +0000
     1.2 +++ b/src/test/graph_test.cc	Sat Nov 13 21:37:54 2004 +0000
     1.3 @@ -20,46 +20,46 @@
     1.4  int main() {
     1.5    ///\file
     1.6    { // checking graph components
     1.7 -    function_requires<BaseGraphComponentConcept<BaseGraphComponent> >();
     1.8 +    checkConcept<BaseGraphComponent, BaseGraphComponent >();
     1.9  
    1.10 -    function_requires<BaseIterableGraphComponentConcept<BaseIterableGraphComponent> >();
    1.11 +    checkConcept<BaseIterableGraphComponent, BaseIterableGraphComponent >();
    1.12  
    1.13 -    function_requires<IDableGraphComponentConcept<IDableGraphComponent> >();
    1.14 -    function_requires<MaxIDableGraphComponentConcept<MaxIDableGraphComponent> >();
    1.15 +    checkConcept<IDableGraphComponent, IDableGraphComponent >();
    1.16 +    checkConcept<MaxIDableGraphComponent, MaxIDableGraphComponent >();
    1.17  
    1.18 -    function_requires<BaseExtendableGraphComponentConcept<BaseExtendableGraphComponent> >();
    1.19 -    function_requires<BaseErasableGraphComponentConcept<BaseErasableGraphComponent> >();
    1.20 -    function_requires<BaseClearableGraphComponentConcept<BaseClearableGraphComponent> >();
    1.21 +    checkConcept<BaseExtendableGraphComponent, BaseExtendableGraphComponent >();
    1.22 +    checkConcept<BaseErasableGraphComponent, BaseErasableGraphComponent >();
    1.23 +    checkConcept<BaseClearableGraphComponent, BaseClearableGraphComponent >();
    1.24  
    1.25 -    function_requires<IterableGraphComponentConcept<IterableGraphComponent> >();
    1.26 +    checkConcept<IterableGraphComponent, IterableGraphComponent >();
    1.27  
    1.28 -    function_requires<MappableGraphComponentConcept<MappableGraphComponent> >();
    1.29 +    checkConcept<MappableGraphComponent, MappableGraphComponent >();
    1.30  
    1.31 -    function_requires<ExtendableGraphComponentConcept<ExtendableGraphComponent> >();
    1.32 -    function_requires<ErasableGraphComponentConcept<ErasableGraphComponent> >();
    1.33 -    function_requires<ClearableGraphComponentConcept<ClearableGraphComponent> >();
    1.34 +    checkConcept<ExtendableGraphComponent, ExtendableGraphComponent >();
    1.35 +    checkConcept<ErasableGraphComponent, ErasableGraphComponent >();
    1.36 +    checkConcept<ClearableGraphComponent, ClearableGraphComponent >();
    1.37    }
    1.38    { // checking skeleton graphs
    1.39 -    function_requires<StaticGraphConcept<StaticGraph> >();
    1.40 -    function_requires<ExtendableGraphConcept<ExtendableGraph> >();
    1.41 -    function_requires<ErasableGraphConcept<ErasableGraph> >();
    1.42 +    checkConcept<StaticGraph, StaticGraph >();
    1.43 +    checkConcept<ExtendableGraph, ExtendableGraph >();
    1.44 +    checkConcept<ErasableGraph, ErasableGraph >();
    1.45    }
    1.46    { // checking list graph
    1.47 -    function_requires<ErasableGraphConcept<ListGraph> >();
    1.48 +    checkConcept<ErasableGraph, ListGraph >();
    1.49  
    1.50      checkGraph<ListGraph>();
    1.51      checkGraphNodeMap<ListGraph>();
    1.52      checkGraphEdgeMap<ListGraph>();
    1.53    }
    1.54    { // checking smart graph
    1.55 -    function_requires<ExtendableGraphConcept<SmartGraph> >();
    1.56 +    checkConcept<ExtendableGraph, SmartGraph >();
    1.57  
    1.58      checkGraph<SmartGraph>();
    1.59      checkGraphNodeMap<SmartGraph>();
    1.60      checkGraphEdgeMap<SmartGraph>();
    1.61    }
    1.62    { // checking full graph
    1.63 -    function_requires<StaticGraphConcept<FullGraph> >();
    1.64 +    checkConcept<StaticGraph, FullGraph >();
    1.65    }
    1.66  
    1.67    std::cout << __FILE__ ": All tests passed.\n";