1.1 --- a/lemon/bits/default_map.h	Mon Jan 12 23:11:39 2009 +0100
     1.2 +++ b/lemon/bits/default_map.h	Thu Nov 05 15:48:01 2009 +0100
     1.3 @@ -19,6 +19,7 @@
     1.4  #ifndef LEMON_BITS_DEFAULT_MAP_H
     1.5  #define LEMON_BITS_DEFAULT_MAP_H
     1.6  
     1.7 +#include <lemon/config.h>
     1.8  #include <lemon/bits/array_map.h>
     1.9  #include <lemon/bits/vector_map.h>
    1.10  //#include <lemon/bits/debug_map.h>
    1.11 @@ -96,7 +97,7 @@
    1.12    };
    1.13  
    1.14  
    1.15 -#if defined __GNUC__ && !defined __STRICT_ANSI__
    1.16 +#if defined LEMON_HAVE_LONG_LONG
    1.17  
    1.18    // long long
    1.19    template <typename _Graph, typename _Item>
    1.20 @@ -152,15 +153,16 @@
    1.21    template <typename _Graph, typename _Item, typename _Value>
    1.22    class DefaultMap
    1.23      : public DefaultMapSelector<_Graph, _Item, _Value>::Map {
    1.24 +    typedef typename DefaultMapSelector<_Graph, _Item, _Value>::Map Parent;
    1.25 +
    1.26    public:
    1.27 -    typedef typename DefaultMapSelector<_Graph, _Item, _Value>::Map Parent;
    1.28      typedef DefaultMap<_Graph, _Item, _Value> Map;
    1.29 -
    1.30 -    typedef typename Parent::Graph Graph;
    1.31 +    
    1.32 +    typedef typename Parent::GraphType GraphType;
    1.33      typedef typename Parent::Value Value;
    1.34  
    1.35 -    explicit DefaultMap(const Graph& graph) : Parent(graph) {}
    1.36 -    DefaultMap(const Graph& graph, const Value& value)
    1.37 +    explicit DefaultMap(const GraphType& graph) : Parent(graph) {}
    1.38 +    DefaultMap(const GraphType& graph, const Value& value)
    1.39        : Parent(graph, value) {}
    1.40  
    1.41      DefaultMap& operator=(const DefaultMap& cmap) {