diff -r e997802b855c -r 87f7c54892df src/lemon/kruskal.h --- a/src/lemon/kruskal.h Sat Nov 13 12:53:28 2004 +0000 +++ b/src/lemon/kruskal.h Sat Nov 13 17:07:10 2004 +0000 @@ -112,12 +112,12 @@ class NonConstMapWr { const Map &m; public: - typedef typename Map::ValueType ValueType; + typedef typename Map::Value Value; NonConstMapWr(const Map &_m) : m(_m) {} - template - void set(KeyType const& k, ValueType const &v) const { m.set(k,v); } + template + void set(Key const& k, Value const &v) const { m.set(k,v); } }; template @@ -150,11 +150,11 @@ template class KruskalMapInput : public std::vector< std::pair > { + typename Map::Value> > { public: typedef std::vector< std::pair > Parent; + typename Map::Value> > Parent; typedef typename Parent::value_type value_type; private: @@ -235,19 +235,19 @@ /// map and the output is a sequence of the tree edges, a special /// wrapper function exists: \ref kruskalEdgeMap_IteratorOut(). /// - /// \warning Not a regular property map, as it doesn't know its KeyType + /// \warning Not a regular property map, as it doesn't know its Key template class KruskalSequenceOutput { mutable Iterator it; public: - typedef bool ValueType; + typedef bool Value; KruskalSequenceOutput(Iterator const &_it) : it(_it) {} - template - void set(KeyType const& k, bool v) const { if(v) {*it=k; ++it;} } + template + void set(Key const& k, bool v) const { if(v) {*it=k; ++it;} } }; template @@ -287,7 +287,7 @@ template inline - typename IN::ValueType + typename IN::Value kruskalEdgeMap(GR const& G, IN const& in, RET &out) { @@ -332,7 +332,7 @@ template inline - typename IN::ValueType + typename IN::Value kruskalEdgeMap_IteratorOut(const GR& G, const IN& in, RET out)