diff -r c35afa9e89e7 -r ef88c0a30f85 lemon/bits/vector_map.h --- a/lemon/bits/vector_map.h Mon Jan 12 23:11:39 2009 +0100 +++ b/lemon/bits/vector_map.h Thu Nov 05 15:48:01 2009 +0100 @@ -56,7 +56,7 @@ public: // The graph type of the map. - typedef _Graph Graph; + typedef _Graph GraphType; // The item type of the map. typedef _Item Item; // The reference map tag. @@ -72,20 +72,24 @@ // The map type. typedef VectorMap Map; - // The base class of the map. - typedef typename Notifier::ObserverBase Parent; // The reference type of the map; typedef typename Container::reference Reference; // The const reference type of the map; typedef typename Container::const_reference ConstReference; + private: + + // The base class of the map. + typedef typename Notifier::ObserverBase Parent; + + public: // \brief Constructor to attach the new map into the notifier. // // It constructs a map and attachs it into the notifier. // It adds all the items of the graph to the map. - VectorMap(const Graph& graph) { + VectorMap(const GraphType& graph) { Parent::attach(graph.notifier(Item())); container.resize(Parent::notifier()->maxId() + 1); } @@ -94,7 +98,7 @@ // // It constructs a map uses a given value to initialize the map. // It adds all the items of the graph to the map. - VectorMap(const Graph& graph, const Value& value) { + VectorMap(const GraphType& graph, const Value& value) { Parent::attach(graph.notifier(Item())); container.resize(Parent::notifier()->maxId() + 1, value); } @@ -124,7 +128,7 @@ // \brief Template assign operator. // - // The given parameter should be conform to the ReadMap + // The given parameter should conform to the ReadMap // concecpt and could be indiced by the current item set of // the NodeMap. In this case the value for each item // is assigned by the value of the given ReadMap.