Merge
authorAlpar Juttner <alpar@cs.elte.hu>
Wed, 08 Oct 2008 13:16:04 +0100
changeset 3021871777f62b7
parent 301 9db8964f0cf6
parent 300 8c05947fc107
child 304 1e81878b0e54
Merge
     1.1 --- a/lemon/core.h	Wed Oct 08 13:40:20 2008 +0200
     1.2 +++ b/lemon/core.h	Wed Oct 08 13:16:04 2008 +0100
     1.3 @@ -58,7 +58,7 @@
     1.4    /// \addtogroup gutils
     1.5    /// @{
     1.6  
     1.7 -  ///Create convenient typedefs for the digraph types and iterators
     1.8 +  ///Create convenience typedefs for the digraph types and iterators
     1.9  
    1.10    ///This \c \#define creates convenient type definitions for the following
    1.11    ///types of \c Digraph: \c Node,  \c NodeIt, \c Arc, \c ArcIt, \c InArcIt,
    1.12 @@ -80,9 +80,9 @@
    1.13    typedef Digraph::NodeMap<double> DoubleNodeMap;                       \
    1.14    typedef Digraph::ArcMap<bool> BoolArcMap;                             \
    1.15    typedef Digraph::ArcMap<int> IntArcMap;                               \
    1.16 -  typedef Digraph::ArcMap<double> DoubleArcMap;
    1.17 +  typedef Digraph::ArcMap<double> DoubleArcMap
    1.18  
    1.19 -  ///Create convenient typedefs for the digraph types and iterators
    1.20 +  ///Create convenience typedefs for the digraph types and iterators
    1.21  
    1.22    ///\see DIGRAPH_TYPEDEFS
    1.23    ///
    1.24 @@ -100,9 +100,9 @@
    1.25    typedef typename Digraph::template NodeMap<double> DoubleNodeMap;     \
    1.26    typedef typename Digraph::template ArcMap<bool> BoolArcMap;           \
    1.27    typedef typename Digraph::template ArcMap<int> IntArcMap;             \
    1.28 -  typedef typename Digraph::template ArcMap<double> DoubleArcMap;
    1.29 +  typedef typename Digraph::template ArcMap<double> DoubleArcMap
    1.30  
    1.31 -  ///Create convenient typedefs for the graph types and iterators
    1.32 +  ///Create convenience typedefs for the graph types and iterators
    1.33  
    1.34    ///This \c \#define creates the same convenient type definitions as defined
    1.35    ///by \ref DIGRAPH_TYPEDEFS(Graph) and six more, namely it creates
    1.36 @@ -119,9 +119,9 @@
    1.37    typedef Graph::IncEdgeIt IncEdgeIt;                                   \
    1.38    typedef Graph::EdgeMap<bool> BoolEdgeMap;                             \
    1.39    typedef Graph::EdgeMap<int> IntEdgeMap;                               \
    1.40 -  typedef Graph::EdgeMap<double> DoubleEdgeMap;
    1.41 +  typedef Graph::EdgeMap<double> DoubleEdgeMap
    1.42  
    1.43 -  ///Create convenient typedefs for the graph types and iterators
    1.44 +  ///Create convenience typedefs for the graph types and iterators
    1.45  
    1.46    ///\see GRAPH_TYPEDEFS
    1.47    ///
    1.48 @@ -134,7 +134,7 @@
    1.49    typedef typename Graph::IncEdgeIt IncEdgeIt;                          \
    1.50    typedef typename Graph::template EdgeMap<bool> BoolEdgeMap;           \
    1.51    typedef typename Graph::template EdgeMap<int> IntEdgeMap;             \
    1.52 -  typedef typename Graph::template EdgeMap<double> DoubleEdgeMap;
    1.53 +  typedef typename Graph::template EdgeMap<double> DoubleEdgeMap
    1.54  
    1.55    /// \brief Function to count the items in a graph.
    1.56    ///