1.1 --- a/lemon/concept/graph_components.h	Mon Aug 14 16:08:28 2006 +0000
     1.2 +++ b/lemon/concept/graph_components.h	Mon Aug 14 16:14:10 2006 +0000
     1.3 @@ -1294,23 +1294,24 @@
     1.4        ///
     1.5        /// ReadWrite map of the nodes.
     1.6        ///
     1.7 -      template <typename Value>
     1.8 -      class NodeMap : public GraphMap<Graph, Node, Value> {
     1.9 +      template <typename _Value>
    1.10 +      class NodeMap : public GraphMap<Graph, Node, _Value> {
    1.11        private:
    1.12  	NodeMap();
    1.13        public:
    1.14 -        typedef GraphMap<Graph, Node, Value> Parent;
    1.15 +        typedef GraphMap<MappableGraphComponent, Node, _Value> Parent;
    1.16  
    1.17  	/// \brief Construct a new map.
    1.18  	///
    1.19  	/// Construct a new map for the graph.
    1.20  	/// \todo call the right parent class constructor
    1.21 -	explicit NodeMap(const Graph& graph) : Parent(graph) {}
    1.22 +	explicit NodeMap(const MappableGraphComponent& graph) 
    1.23 +          : Parent(graph) {}
    1.24  
    1.25  	/// \brief Construct a new map with default value.
    1.26  	///
    1.27  	/// Construct a new map for the graph and initalise the values.
    1.28 -	NodeMap(const Graph& graph, const Value& value)
    1.29 +	NodeMap(const MappableGraphComponent& graph, const _Value& value)
    1.30            : Parent(graph, value) {}
    1.31  
    1.32  	/// \brief Copy constructor.
    1.33 @@ -1323,7 +1324,7 @@
    1.34  	/// Assign operator.
    1.35          template <typename CMap>
    1.36          NodeMap& operator=(const CMap&) { 
    1.37 -          checkConcept<ReadMap<Node, Value>, CMap>();
    1.38 +          checkConcept<ReadMap<Node, _Value>, CMap>();
    1.39            return *this;
    1.40          }
    1.41  
    1.42 @@ -1333,23 +1334,24 @@
    1.43        ///
    1.44        /// ReadWrite map of the edges.
    1.45        ///
    1.46 -      template <typename Value>
    1.47 -      class EdgeMap : public GraphMap<Graph, Edge, Value> {
    1.48 +      template <typename _Value>
    1.49 +      class EdgeMap : public GraphMap<Graph, Edge, _Value> {
    1.50        private:
    1.51  	EdgeMap();
    1.52        public:
    1.53 -        typedef GraphMap<Graph, Edge, Value> Parent;
    1.54 +        typedef GraphMap<MappableGraphComponent, Edge, _Value> Parent;
    1.55  
    1.56  	/// \brief Construct a new map.
    1.57  	///
    1.58  	/// Construct a new map for the graph.
    1.59  	/// \todo call the right parent class constructor
    1.60 -	explicit EdgeMap(const Graph& graph) : Parent(graph) {}
    1.61 +	explicit EdgeMap(const MappableGraphComponent& graph) 
    1.62 +          : Parent(graph) {}
    1.63  
    1.64  	/// \brief Construct a new map with default value.
    1.65  	///
    1.66  	/// Construct a new map for the graph and initalise the values.
    1.67 -	EdgeMap(const Graph& graph, const Value& value)
    1.68 +	EdgeMap(const MappableGraphComponent& graph, const _Value& value)
    1.69            : Parent(graph, value) {}
    1.70  
    1.71  	/// \brief Copy constructor.
    1.72 @@ -1362,7 +1364,7 @@
    1.73  	/// Assign operator.
    1.74          template <typename CMap>
    1.75          EdgeMap& operator=(const CMap&) { 
    1.76 -          checkConcept<ReadMap<Edge, Value>, CMap>();
    1.77 +          checkConcept<ReadMap<Edge, _Value>, CMap>();
    1.78            return *this;
    1.79          }
    1.80  
    1.81 @@ -1431,21 +1433,22 @@
    1.82        ///
    1.83        /// ReadWrite map of the uedges.
    1.84        ///
    1.85 -      template <typename Value>
    1.86 -      class UEdgeMap : public GraphMap<Graph, UEdge, Value> {  
    1.87 +      template <typename _Value>
    1.88 +      class UEdgeMap : public GraphMap<Graph, UEdge, _Value> {  
    1.89        public:
    1.90 -        typedef GraphMap<Graph, UEdge, Value> Parent;
    1.91 +        typedef GraphMap<MappableUGraphComponent, UEdge, _Value> Parent;
    1.92  
    1.93  	/// \brief Construct a new map.
    1.94  	///
    1.95  	/// Construct a new map for the graph.
    1.96  	/// \todo call the right parent class constructor
    1.97 -	explicit UEdgeMap(const Graph& graph) : Parent(graph) {}
    1.98 +	explicit UEdgeMap(const MappableUGraphComponent& graph) 
    1.99 +          : Parent(graph) {}
   1.100  
   1.101  	/// \brief Construct a new map with default value.
   1.102  	///
   1.103  	/// Construct a new map for the graph and initalise the values.
   1.104 -	UEdgeMap(const Graph& graph, const Value& value)
   1.105 +	UEdgeMap(const MappableUGraphComponent& graph, const _Value& value)
   1.106            : Parent(graph, value) {}
   1.107  
   1.108  	/// \brief Copy constructor.
   1.109 @@ -1458,7 +1461,7 @@
   1.110  	/// Assign operator.
   1.111          template <typename CMap>
   1.112          UEdgeMap& operator=(const CMap&) { 
   1.113 -          checkConcept<ReadMap<UEdge, Value>, CMap>();
   1.114 +          checkConcept<ReadMap<UEdge, _Value>, CMap>();
   1.115            return *this;
   1.116          }
   1.117