diff -r c35afa9e89e7 -r ef88c0a30f85 lemon/bits/array_map.h
--- a/lemon/bits/array_map.h	Mon Jan 12 23:11:39 2009 +0100
+++ b/lemon/bits/array_map.h	Thu Nov 05 15:48:01 2009 +0100
@@ -47,7 +47,7 @@
     : public ItemSetTraits<_Graph, _Item>::ItemNotifier::ObserverBase {
   public:
     // The graph type.
-    typedef _Graph Graph;
+    typedef _Graph GraphType;
     // The item type.
     typedef _Item Item;
     // The reference map tag.
@@ -63,13 +63,17 @@
     // The reference type of the map.
     typedef _Value& Reference;
 
+    // The map type.
+    typedef ArrayMap Map;
+
     // The notifier type.
     typedef typename ItemSetTraits<_Graph, _Item>::ItemNotifier Notifier;
 
+  private:
+  
     // The MapBase of the Map which imlements the core regisitry function.
     typedef typename Notifier::ObserverBase Parent;
 
-  private:
     typedef std::allocator<Value> Allocator;
 
   public:
@@ -77,7 +81,7 @@
     // \brief Graph initialized map constructor.
     //
     // Graph initialized map constructor.
-    explicit ArrayMap(const Graph& graph) {
+    explicit ArrayMap(const GraphType& graph) {
       Parent::attach(graph.notifier(Item()));
       allocate_memory();
       Notifier* nf = Parent::notifier();
@@ -91,7 +95,7 @@
     // \brief Constructor to use default value to initialize the map.
     //
     // It constructs a map and initialize all of the the map.
-    ArrayMap(const Graph& graph, const Value& value) {
+    ArrayMap(const GraphType& graph, const Value& value) {
       Parent::attach(graph.notifier(Item()));
       allocate_memory();
       Notifier* nf = Parent::notifier();
@@ -135,7 +139,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.