diff -r 2ba916d7aae3 -r 2ff283124dfc lemon/bits/default_map.h
--- a/lemon/bits/default_map.h	Mon Mar 06 09:38:19 2006 +0000
+++ b/lemon/bits/default_map.h	Mon Mar 06 10:28:37 2006 +0000
@@ -16,18 +16,16 @@
  *
  */
 
-#ifndef LEMON_DEFAULT_MAP_H
-#define LEMON_DEFAULT_MAP_H
+#ifndef LEMON_BITS_DEFAULT_MAP_H
+#define LEMON_BITS_DEFAULT_MAP_H
 
 
 #include <lemon/bits/array_map.h>
 #include <lemon/bits/vector_map.h>
-#include <lemon/bits/static_map.h>
 
 ///\ingroup graphbits
 ///\file
-///\brief Graph maps that construct and destruct
-///their elements dynamically.
+///\brief Graph maps that construct and destruct their elements dynamically.
 
 namespace lemon {
   
@@ -151,10 +149,7 @@
   };
 
   /// \e
-  template <
-    typename _Graph, 
-    typename _Item,
-    typename _Value>
+  template <typename _Graph, typename _Item, typename _Value>
   class DefaultMap 
     : public DefaultMapSelector<_Graph, _Item, _Value>::Map {
   public:
@@ -164,8 +159,9 @@
     typedef typename Parent::Graph Graph;
     typedef typename Parent::Value Value;
 
-    DefaultMap(const Graph& _g) : Parent(_g) {}
-    DefaultMap(const Graph& _g, const Value& _v) : Parent(_g, _v) {}
+    DefaultMap(const Graph& graph) : Parent(graph) {}
+    DefaultMap(const Graph& graph, const Value& value) 
+      : Parent(graph, value) {}
 
   };