1.1 --- a/lemon/bits/default_map.h Fri Nov 13 12:33:33 2009 +0100
1.2 +++ b/lemon/bits/default_map.h Thu Dec 10 17:05:35 2009 +0100
1.3 @@ -2,7 +2,7 @@
1.4 *
1.5 * This file is a part of LEMON, a generic C++ optimization library.
1.6 *
1.7 - * Copyright (C) 2003-2008
1.8 + * Copyright (C) 2003-2009
1.9 * Egervary Jeno Kombinatorikus Optimalizalasi Kutatocsoport
1.10 * (Egervary Research Group on Combinatorial Optimization, EGRES).
1.11 *
1.12 @@ -153,15 +153,16 @@
1.13 template <typename _Graph, typename _Item, typename _Value>
1.14 class DefaultMap
1.15 : public DefaultMapSelector<_Graph, _Item, _Value>::Map {
1.16 + typedef typename DefaultMapSelector<_Graph, _Item, _Value>::Map Parent;
1.17 +
1.18 public:
1.19 - typedef typename DefaultMapSelector<_Graph, _Item, _Value>::Map Parent;
1.20 typedef DefaultMap<_Graph, _Item, _Value> Map;
1.21 -
1.22 - typedef typename Parent::Graph Graph;
1.23 +
1.24 + typedef typename Parent::GraphType GraphType;
1.25 typedef typename Parent::Value Value;
1.26
1.27 - explicit DefaultMap(const Graph& graph) : Parent(graph) {}
1.28 - DefaultMap(const Graph& graph, const Value& value)
1.29 + explicit DefaultMap(const GraphType& graph) : Parent(graph) {}
1.30 + DefaultMap(const GraphType& graph, const Value& value)
1.31 : Parent(graph, value) {}
1.32
1.33 DefaultMap& operator=(const DefaultMap& cmap) {