1.1 --- a/lemon/graph_utils.h Sun Jul 13 20:09:47 2008 +0100
1.2 +++ b/lemon/graph_utils.h Mon Jul 14 09:15:23 2008 +0200
1.3 @@ -52,18 +52,18 @@
1.4 ///\note If the graph type is a dependent type, ie. the graph type depend
1.5 ///on a template parameter, then use \c TEMPLATE_DIGRAPH_TYPEDEFS()
1.6 ///macro.
1.7 -#define DIGRAPH_TYPEDEFS(Digraph) \
1.8 - typedef Digraph::Node Node; \
1.9 - typedef Digraph::NodeIt NodeIt; \
1.10 - typedef Digraph::Arc Arc; \
1.11 - typedef Digraph::ArcIt ArcIt; \
1.12 - typedef Digraph::InArcIt InArcIt; \
1.13 - typedef Digraph::OutArcIt OutArcIt; \
1.14 - typedef Digraph::NodeMap<bool> BoolNodeMap; \
1.15 - typedef Digraph::NodeMap<int> IntNodeMap; \
1.16 - typedef Digraph::NodeMap<double> DoubleNodeMap; \
1.17 - typedef Digraph::ArcMap<bool> BoolArcMap; \
1.18 - typedef Digraph::ArcMap<int> IntArcMap; \
1.19 +#define DIGRAPH_TYPEDEFS(Digraph) \
1.20 + typedef Digraph::Node Node; \
1.21 + typedef Digraph::NodeIt NodeIt; \
1.22 + typedef Digraph::Arc Arc; \
1.23 + typedef Digraph::ArcIt ArcIt; \
1.24 + typedef Digraph::InArcIt InArcIt; \
1.25 + typedef Digraph::OutArcIt OutArcIt; \
1.26 + typedef Digraph::NodeMap<bool> BoolNodeMap; \
1.27 + typedef Digraph::NodeMap<int> IntNodeMap; \
1.28 + typedef Digraph::NodeMap<double> DoubleNodeMap; \
1.29 + typedef Digraph::ArcMap<bool> BoolArcMap; \
1.30 + typedef Digraph::ArcMap<int> IntArcMap; \
1.31 typedef Digraph::ArcMap<double> DoubleArcMap
1.32
1.33 ///Creates convenience typedefs for the digraph types and iterators
1.34 @@ -72,18 +72,18 @@
1.35 ///
1.36 ///\note Use this macro, if the graph type is a dependent type,
1.37 ///ie. the graph type depend on a template parameter.
1.38 -#define TEMPLATE_DIGRAPH_TYPEDEFS(Digraph) \
1.39 - typedef typename Digraph::Node Node; \
1.40 - typedef typename Digraph::NodeIt NodeIt; \
1.41 - typedef typename Digraph::Arc Arc; \
1.42 +#define TEMPLATE_DIGRAPH_TYPEDEFS(Digraph) \
1.43 + typedef typename Digraph::Node Node; \
1.44 + typedef typename Digraph::NodeIt NodeIt; \
1.45 + typedef typename Digraph::Arc Arc; \
1.46 typedef typename Digraph::ArcIt ArcIt; \
1.47 - typedef typename Digraph::InArcIt InArcIt; \
1.48 - typedef typename Digraph::OutArcIt OutArcIt; \
1.49 - typedef typename Digraph::template NodeMap<bool> BoolNodeMap; \
1.50 - typedef typename Digraph::template NodeMap<int> IntNodeMap; \
1.51 - typedef typename Digraph::template NodeMap<double> DoubleNodeMap; \
1.52 - typedef typename Digraph::template ArcMap<bool> BoolArcMap; \
1.53 - typedef typename Digraph::template ArcMap<int> IntArcMap; \
1.54 + typedef typename Digraph::InArcIt InArcIt; \
1.55 + typedef typename Digraph::OutArcIt OutArcIt; \
1.56 + typedef typename Digraph::template NodeMap<bool> BoolNodeMap; \
1.57 + typedef typename Digraph::template NodeMap<int> IntNodeMap; \
1.58 + typedef typename Digraph::template NodeMap<double> DoubleNodeMap; \
1.59 + typedef typename Digraph::template ArcMap<bool> BoolArcMap; \
1.60 + typedef typename Digraph::template ArcMap<int> IntArcMap; \
1.61 typedef typename Digraph::template ArcMap<double> DoubleArcMap
1.62
1.63 ///Creates convenience typedefs for the graph types and iterators
1.64 @@ -96,13 +96,13 @@
1.65 ///\note If the graph type is a dependent type, ie. the graph type depend
1.66 ///on a template parameter, then use \c TEMPLATE_DIGRAPH_TYPEDEFS()
1.67 ///macro.
1.68 -#define GRAPH_TYPEDEFS(Graph) \
1.69 - DIGRAPH_TYPEDEFS(Graph); \
1.70 - typedef Graph::Edge Edge; \
1.71 - typedef Graph::EdgeIt EdgeIt; \
1.72 - typedef Graph::IncEdgeIt IncEdgeIt; \
1.73 - typedef Graph::EdgeMap<bool> BoolEdgeMap; \
1.74 - typedef Graph::EdgeMap<int> IntEdgeMap; \
1.75 +#define GRAPH_TYPEDEFS(Graph) \
1.76 + DIGRAPH_TYPEDEFS(Graph); \
1.77 + typedef Graph::Edge Edge; \
1.78 + typedef Graph::EdgeIt EdgeIt; \
1.79 + typedef Graph::IncEdgeIt IncEdgeIt; \
1.80 + typedef Graph::EdgeMap<bool> BoolEdgeMap; \
1.81 + typedef Graph::EdgeMap<int> IntEdgeMap; \
1.82 typedef Graph::EdgeMap<double> DoubleEdgeMap
1.83
1.84 ///Creates convenience typedefs for the graph types and iterators
1.85 @@ -111,13 +111,13 @@
1.86 ///
1.87 ///\note Use this macro, if the graph type is a dependent type,
1.88 ///ie. the graph type depend on a template parameter.
1.89 -#define TEMPLATE_GRAPH_TYPEDEFS(Graph) \
1.90 - TEMPLATE_DIGRAPH_TYPEDEFS(Graph); \
1.91 - typedef typename Graph::Edge Edge; \
1.92 +#define TEMPLATE_GRAPH_TYPEDEFS(Graph) \
1.93 + TEMPLATE_DIGRAPH_TYPEDEFS(Graph); \
1.94 + typedef typename Graph::Edge Edge; \
1.95 typedef typename Graph::EdgeIt EdgeIt; \
1.96 - typedef typename Graph::IncEdgeIt IncEdgeIt; \
1.97 - typedef typename Graph::template EdgeMap<bool> BoolEdgeMap; \
1.98 - typedef typename Graph::template EdgeMap<int> IntEdgeMap; \
1.99 + typedef typename Graph::IncEdgeIt IncEdgeIt; \
1.100 + typedef typename Graph::template EdgeMap<bool> BoolEdgeMap; \
1.101 + typedef typename Graph::template EdgeMap<int> IntEdgeMap; \
1.102 typedef typename Graph::template EdgeMap<double> DoubleEdgeMap
1.103
1.104 /// \brief Function to count the items in the graph.