1.1 --- a/lemon/bits/default_map.h	Mon Mar 06 09:38:19 2006 +0000
     1.2 +++ b/lemon/bits/default_map.h	Mon Mar 06 10:28:37 2006 +0000
     1.3 @@ -16,18 +16,16 @@
     1.4   *
     1.5   */
     1.6  
     1.7 -#ifndef LEMON_DEFAULT_MAP_H
     1.8 -#define LEMON_DEFAULT_MAP_H
     1.9 +#ifndef LEMON_BITS_DEFAULT_MAP_H
    1.10 +#define LEMON_BITS_DEFAULT_MAP_H
    1.11  
    1.12  
    1.13  #include <lemon/bits/array_map.h>
    1.14  #include <lemon/bits/vector_map.h>
    1.15 -#include <lemon/bits/static_map.h>
    1.16  
    1.17  ///\ingroup graphbits
    1.18  ///\file
    1.19 -///\brief Graph maps that construct and destruct
    1.20 -///their elements dynamically.
    1.21 +///\brief Graph maps that construct and destruct their elements dynamically.
    1.22  
    1.23  namespace lemon {
    1.24    
    1.25 @@ -151,10 +149,7 @@
    1.26    };
    1.27  
    1.28    /// \e
    1.29 -  template <
    1.30 -    typename _Graph, 
    1.31 -    typename _Item,
    1.32 -    typename _Value>
    1.33 +  template <typename _Graph, typename _Item, typename _Value>
    1.34    class DefaultMap 
    1.35      : public DefaultMapSelector<_Graph, _Item, _Value>::Map {
    1.36    public:
    1.37 @@ -164,8 +159,9 @@
    1.38      typedef typename Parent::Graph Graph;
    1.39      typedef typename Parent::Value Value;
    1.40  
    1.41 -    DefaultMap(const Graph& _g) : Parent(_g) {}
    1.42 -    DefaultMap(const Graph& _g, const Value& _v) : Parent(_g, _v) {}
    1.43 +    DefaultMap(const Graph& graph) : Parent(graph) {}
    1.44 +    DefaultMap(const Graph& graph, const Value& value) 
    1.45 +      : Parent(graph, value) {}
    1.46  
    1.47    };
    1.48