1.1 --- a/src/lemon/graph_wrapper.h Sat Nov 13 12:53:28 2004 +0000
1.2 +++ b/src/lemon/graph_wrapper.h Sat Nov 13 17:07:10 2004 +0000
1.3 @@ -1121,8 +1121,8 @@
1.4 template <typename TT> friend class EdgeMap;
1.5 typename Graph::template EdgeMap<T> forward_map, backward_map;
1.6 public:
1.7 - typedef T ValueType;
1.8 - typedef Edge KeyType;
1.9 + typedef T Value;
1.10 + typedef Edge Key;
1.11
1.12 EdgeMap(const SubBidirGraphWrapper<Graph,
1.13 ForwardFilterMap, BackwardFilterMap>& g) :
1.14 @@ -1150,7 +1150,7 @@
1.15 backward_map.set(e, a);
1.16 }
1.17
1.18 - typename Graph::template EdgeMap<T>::ConstReferenceType
1.19 + typename Graph::template EdgeMap<T>::ConstReference
1.20 operator[](Edge e) const {
1.21 if (!e.backward)
1.22 return forward_map[e];
1.23 @@ -1158,7 +1158,7 @@
1.24 return backward_map[e];
1.25 }
1.26
1.27 - typename Graph::template EdgeMap<T>::ReferenceType
1.28 + typename Graph::template EdgeMap<T>::Reference
1.29 operator[](Edge e) {
1.30 if (!e.backward)
1.31 return forward_map[e];
1.32 @@ -1345,8 +1345,8 @@
1.33 protected:
1.34 const ResGraphWrapper<Graph, Number, CapacityMap, FlowMap>* res_graph;
1.35 public:
1.36 - typedef Number ValueType;
1.37 - typedef Edge KeyType;
1.38 + typedef Number Value;
1.39 + typedef Edge Key;
1.40 ResCap(const ResGraphWrapper<Graph, Number, CapacityMap, FlowMap>&
1.41 _res_graph) : res_graph(&_res_graph) { }
1.42 Number operator[](const Edge& e) const {