1.1 --- a/src/lemon/map_defines.h	Sat Nov 13 12:53:28 2004 +0000
     1.2 +++ b/src/lemon/map_defines.h	Sat Nov 13 17:07:10 2004 +0000
     1.3 @@ -51,13 +51,13 @@
     1.4   *  supports this feature it should be fixed.
     1.5   */
     1.6  #define CREATE_NODE_MAP(DynMap) \
     1.7 -template <typename Value> \
     1.8 -class NodeMap : public DynMap<NodeMapRegistry, Value> { \
     1.9 +template <typename _Value> \
    1.10 +class NodeMap : public DynMap<NodeMapRegistry, _Value> { \
    1.11  public: \
    1.12 -typedef DynMap<NodeMapRegistry, Value> Parent; \
    1.13 +typedef DynMap<NodeMapRegistry, _Value> Parent; \
    1.14  NodeMap(const typename Parent::Graph& g) \
    1.15    : Parent(g, g.node_maps) {} \
    1.16 -NodeMap(const typename Parent::Graph& g, const Value& v) \
    1.17 +NodeMap(const typename Parent::Graph& g, const _Value& v) \
    1.18    : Parent(g, g.node_maps, v) {} \
    1.19  NodeMap(const NodeMap& copy) : Parent(static_cast<const Parent&>(copy)) {} \
    1.20  template <typename TT> \
    1.21 @@ -81,14 +81,14 @@
    1.22   *  supports this feature it should be fixed.
    1.23   */
    1.24  #define CREATE_EDGE_MAP(DynMap) \
    1.25 -template <typename Value> \
    1.26 -class EdgeMap : public DynMap<EdgeMapRegistry, Value> { \
    1.27 +template <typename _Value> \
    1.28 +class EdgeMap : public DynMap<EdgeMapRegistry, _Value> { \
    1.29  public: \
    1.30 -typedef DynMap<EdgeMapRegistry, Value> Parent; \
    1.31 +typedef DynMap<EdgeMapRegistry, _Value> Parent; \
    1.32  \
    1.33  EdgeMap(const typename Parent::Graph& g) \
    1.34    : Parent(g, g.edge_maps) {} \
    1.35 -EdgeMap(const typename Parent::Graph& g, const Value& v) \
    1.36 +EdgeMap(const typename Parent::Graph& g, const _Value& v) \
    1.37    : Parent(g, g.edge_maps, v) {} \
    1.38  EdgeMap(const EdgeMap& copy) : Parent(static_cast<const Parent&>(copy)) {} \
    1.39  template <typename TT> \
    1.40 @@ -125,14 +125,14 @@
    1.41   *  supports this feature it should be fixed.
    1.42   */
    1.43  #define CREATE_SYM_EDGE_MAP(DynMap) \
    1.44 -template <typename Value> \
    1.45 -class SymEdgeMap : public DynMap<SymEdgeMapRegistry, Value> { \
    1.46 +template <typename _Value> \
    1.47 +class SymEdgeMap : public DynMap<SymEdgeMapRegistry, _Value> { \
    1.48  public: \
    1.49 -typedef DynMap<SymEdgeMapRegistry, Value> Parent; \
    1.50 +typedef DynMap<SymEdgeMapRegistry, _Value> Parent; \
    1.51  \
    1.52  SymEdgeMap(const typename Parent::Graph& g) \
    1.53    : Parent(g, g.sym_edge_maps) {} \
    1.54 -SymEdgeMap(const typename Parent::Graph& g, const Value& v) \
    1.55 +SymEdgeMap(const typename Parent::Graph& g, const _Value& v) \
    1.56    : Parent(g, g.sym_edge_maps, v) {} \
    1.57  SymEdgeMap(const SymEdgeMap& copy) \
    1.58    : Parent(static_cast<const Parent&>(copy)) {} \
    1.59 @@ -153,15 +153,15 @@
    1.60  /** This is a macro to import an node map into a graph class.
    1.61   */
    1.62  #define IMPORT_NODE_MAP(From, from, To, to) \
    1.63 -template <typename Value> \
    1.64 -class NodeMap : public From::template NodeMap<Value> { \
    1.65 +template <typename _Value> \
    1.66 +class NodeMap : public From::template NodeMap<_Value> { \
    1.67  \
    1.68  public: \
    1.69 -typedef typename From::template NodeMap<Value> Parent; \
    1.70 +typedef typename From::template NodeMap<_Value> Parent; \
    1.71  \
    1.72  NodeMap(const To& to) \
    1.73    : Parent(static_cast<const From&>(from)) { } \
    1.74 -NodeMap(const To& to, const Value& value) \
    1.75 +NodeMap(const To& to, const _Value& value) \
    1.76    : Parent(static_cast<const From&>(from), value) { } \
    1.77  NodeMap(const NodeMap& copy) \
    1.78    : Parent(static_cast<const Parent&>(copy)) {} \
    1.79 @@ -182,15 +182,15 @@
    1.80  /** This is a macro to import an edge map into a graph class.
    1.81   */
    1.82  #define IMPORT_EDGE_MAP(From, from, To, to) \
    1.83 -template <typename Value> \
    1.84 -class EdgeMap : public From::template EdgeMap<Value> { \
    1.85 +template <typename _Value> \
    1.86 +class EdgeMap : public From::template EdgeMap<_Value> { \
    1.87  \
    1.88  public: \
    1.89 -typedef typename From::template EdgeMap<Value> Parent; \
    1.90 +typedef typename From::template EdgeMap<_Value> Parent; \
    1.91  \
    1.92  EdgeMap(const To& to) \
    1.93    : Parent(static_cast<const From&>(from)) { } \
    1.94 -EdgeMap(const To& to, const Value& value) \
    1.95 +EdgeMap(const To& to, const _Value& value) \
    1.96    : Parent(static_cast<const From&>(from), value) { } \
    1.97  EdgeMap(const EdgeMap& copy) \
    1.98    : Parent(static_cast<const Parent&>(copy)) {} \