diff -r e997802b855c -r 87f7c54892df src/lemon/map_defines.h --- a/src/lemon/map_defines.h Sat Nov 13 12:53:28 2004 +0000 +++ b/src/lemon/map_defines.h Sat Nov 13 17:07:10 2004 +0000 @@ -51,13 +51,13 @@ * supports this feature it should be fixed. */ #define CREATE_NODE_MAP(DynMap) \ -template \ -class NodeMap : public DynMap { \ +template \ +class NodeMap : public DynMap { \ public: \ -typedef DynMap Parent; \ +typedef DynMap Parent; \ NodeMap(const typename Parent::Graph& g) \ : Parent(g, g.node_maps) {} \ -NodeMap(const typename Parent::Graph& g, const Value& v) \ +NodeMap(const typename Parent::Graph& g, const _Value& v) \ : Parent(g, g.node_maps, v) {} \ NodeMap(const NodeMap& copy) : Parent(static_cast(copy)) {} \ template \ @@ -81,14 +81,14 @@ * supports this feature it should be fixed. */ #define CREATE_EDGE_MAP(DynMap) \ -template \ -class EdgeMap : public DynMap { \ +template \ +class EdgeMap : public DynMap { \ public: \ -typedef DynMap Parent; \ +typedef DynMap Parent; \ \ EdgeMap(const typename Parent::Graph& g) \ : Parent(g, g.edge_maps) {} \ -EdgeMap(const typename Parent::Graph& g, const Value& v) \ +EdgeMap(const typename Parent::Graph& g, const _Value& v) \ : Parent(g, g.edge_maps, v) {} \ EdgeMap(const EdgeMap& copy) : Parent(static_cast(copy)) {} \ template \ @@ -125,14 +125,14 @@ * supports this feature it should be fixed. */ #define CREATE_SYM_EDGE_MAP(DynMap) \ -template \ -class SymEdgeMap : public DynMap { \ +template \ +class SymEdgeMap : public DynMap { \ public: \ -typedef DynMap Parent; \ +typedef DynMap Parent; \ \ SymEdgeMap(const typename Parent::Graph& g) \ : Parent(g, g.sym_edge_maps) {} \ -SymEdgeMap(const typename Parent::Graph& g, const Value& v) \ +SymEdgeMap(const typename Parent::Graph& g, const _Value& v) \ : Parent(g, g.sym_edge_maps, v) {} \ SymEdgeMap(const SymEdgeMap& copy) \ : Parent(static_cast(copy)) {} \ @@ -153,15 +153,15 @@ /** This is a macro to import an node map into a graph class. */ #define IMPORT_NODE_MAP(From, from, To, to) \ -template \ -class NodeMap : public From::template NodeMap { \ +template \ +class NodeMap : public From::template NodeMap<_Value> { \ \ public: \ -typedef typename From::template NodeMap Parent; \ +typedef typename From::template NodeMap<_Value> Parent; \ \ NodeMap(const To& to) \ : Parent(static_cast(from)) { } \ -NodeMap(const To& to, const Value& value) \ +NodeMap(const To& to, const _Value& value) \ : Parent(static_cast(from), value) { } \ NodeMap(const NodeMap& copy) \ : Parent(static_cast(copy)) {} \ @@ -182,15 +182,15 @@ /** This is a macro to import an edge map into a graph class. */ #define IMPORT_EDGE_MAP(From, from, To, to) \ -template \ -class EdgeMap : public From::template EdgeMap { \ +template \ +class EdgeMap : public From::template EdgeMap<_Value> { \ \ public: \ -typedef typename From::template EdgeMap Parent; \ +typedef typename From::template EdgeMap<_Value> Parent; \ \ EdgeMap(const To& to) \ : Parent(static_cast(from)) { } \ -EdgeMap(const To& to, const Value& value) \ +EdgeMap(const To& to, const _Value& value) \ : Parent(static_cast(from), value) { } \ EdgeMap(const EdgeMap& copy) \ : Parent(static_cast(copy)) {} \