diff -r 411819b8702c -r e5af35e6c93f lemon/adaptors.h --- a/lemon/adaptors.h Fri Mar 23 16:09:27 2018 +0100 +++ b/lemon/adaptors.h Wed Oct 17 19:18:04 2018 +0200 @@ -3446,26 +3446,26 @@ /// /// This map adaptor class adapts two node maps of the original digraph /// to get a node map of the split digraph. - /// Its value type is inherited from the first node map type (\c IN). - /// \tparam IN The type of the node map for the in-nodes. - /// \tparam OUT The type of the node map for the out-nodes. - template + /// Its value type is inherited from the first node map type (\c In). + /// \tparam In The type of the node map for the in-nodes. + /// \tparam Out The type of the node map for the out-nodes. + template class CombinedNodeMap { public: /// The key type of the map typedef Node Key; /// The value type of the map - typedef typename IN::Value Value; - - typedef typename MapTraits::ReferenceMapTag ReferenceMapTag; - typedef typename MapTraits::ReturnValue ReturnValue; - typedef typename MapTraits::ConstReturnValue ConstReturnValue; - typedef typename MapTraits::ReturnValue Reference; - typedef typename MapTraits::ConstReturnValue ConstReference; + typedef typename In::Value Value; + + typedef typename MapTraits::ReferenceMapTag ReferenceMapTag; + typedef typename MapTraits::ReturnValue ReturnValue; + typedef typename MapTraits::ConstReturnValue ConstReturnValue; + typedef typename MapTraits::ReturnValue Reference; + typedef typename MapTraits::ConstReturnValue ConstReference; /// Constructor - CombinedNodeMap(IN& in_map, OUT& out_map) + CombinedNodeMap(In& in_map, Out& out_map) : _in_map(in_map), _out_map(out_map) {} /// Returns the value associated with the given key. @@ -3497,8 +3497,8 @@ private: - IN& _in_map; - OUT& _out_map; + In& _in_map; + Out& _out_map; }; @@ -3506,28 +3506,28 @@ /// \brief Returns a combined node map /// /// This function just returns a combined node map. - template - static CombinedNodeMap - combinedNodeMap(IN& in_map, OUT& out_map) { - return CombinedNodeMap(in_map, out_map); + template + static CombinedNodeMap + combinedNodeMap(In& in_map, Out& out_map) { + return CombinedNodeMap(in_map, out_map); } - template - static CombinedNodeMap - combinedNodeMap(const IN& in_map, OUT& out_map) { - return CombinedNodeMap(in_map, out_map); + template + static CombinedNodeMap + combinedNodeMap(const In& in_map, Out& out_map) { + return CombinedNodeMap(in_map, out_map); } - template - static CombinedNodeMap - combinedNodeMap(IN& in_map, const OUT& out_map) { - return CombinedNodeMap(in_map, out_map); + template + static CombinedNodeMap + combinedNodeMap(In& in_map, const Out& out_map) { + return CombinedNodeMap(in_map, out_map); } - template - static CombinedNodeMap - combinedNodeMap(const IN& in_map, const OUT& out_map) { - return CombinedNodeMap(in_map, out_map); + template + static CombinedNodeMap + combinedNodeMap(const In& in_map, const Out& out_map) { + return CombinedNodeMap(in_map, out_map); } /// \brief Arc map combined from an arc map and a node map of the