1.1 --- a/benchmark/bench_tools.h	Wed Nov 02 15:28:37 2005 +0000
     1.2 +++ b/benchmark/bench_tools.h	Wed Nov 02 16:32:29 2005 +0000
     1.3 @@ -5,26 +5,9 @@
     1.4  #include<vector>
     1.5  #include<iostream>
     1.6  
     1.7 +#include<lemon/graph_utils.h>
     1.8  #include<lemon/time_measure.h>
     1.9  
    1.10 -///An experimental typedef factory
    1.11 -#define GRAPH_TYPEDEF_FACTORY(Graph) \
    1.12 -   typedef typename Graph::   Node      Node;\
    1.13 -   typedef typename Graph::   NodeIt    NodeIt;\
    1.14 -   typedef typename Graph::   Edge      Edge;\
    1.15 -   typedef typename Graph::   EdgeIt    EdgeIt;\
    1.16 -   typedef typename Graph:: InEdgeIt  InEdgeIt;\
    1.17 -   typedef typename Graph::OutEdgeIt OutEdgeIt;
    1.18 -
    1.19 -#define GRAPH_TYPEDEF_FACTORY_NOTYPENAME(Graph) \
    1.20 -   typedef Graph::   Node      Node;\
    1.21 -   typedef Graph::   NodeIt    NodeIt;\
    1.22 -   typedef Graph::   Edge      Edge;\
    1.23 -   typedef Graph::   EdgeIt    EdgeIt;\
    1.24 -   typedef Graph:: InEdgeIt  InEdgeIt;\
    1.25 -   typedef Graph::OutEdgeIt OutEdgeIt;
    1.26 - 
    1.27 -
    1.28  ///A primitive primtest
    1.29  
    1.30  ///\bug 2 is not a prime according to this function!
    1.31 @@ -93,7 +76,7 @@
    1.32  template<class Graph>
    1.33  void addHyperCube(Graph &G,int dim,std::vector<typename Graph::Node> &nodes)
    1.34  {
    1.35 -  GRAPH_TYPEDEF_FACTORY(Graph);
    1.36 +  GRAPH_TYPEDEFS(typename Graph);
    1.37    
    1.38    std::vector<int> bits(dim+1);
    1.39    bits[0]=1;
    1.40 @@ -109,7 +92,7 @@
    1.41  template<class Graph>
    1.42  void addBiDirHyperCube(Graph &G,int dim,std::vector<typename Graph::Node>&nodes)
    1.43  {
    1.44 -  GRAPH_TYPEDEF_FACTORY(Graph);
    1.45 +  GRAPH_TYPEDEFS(typename Graph);
    1.46    
    1.47    std::vector<int> bits(dim+1);
    1.48    bits[0]=1;