1.1 --- a/lemon/adaptors.h	Thu Sep 13 11:56:19 2012 +0200
     1.2 +++ b/lemon/adaptors.h	Mon Jul 16 16:21:40 2018 +0200
     1.3 @@ -3446,26 +3446,26 @@
     1.4      ///
     1.5      /// This map adaptor class adapts two node maps of the original digraph
     1.6      /// to get a node map of the split digraph.
     1.7 -    /// Its value type is inherited from the first node map type (\c IN).
     1.8 -    /// \tparam IN The type of the node map for the in-nodes.
     1.9 -    /// \tparam OUT The type of the node map for the out-nodes.
    1.10 -    template <typename IN, typename OUT>
    1.11 +    /// Its value type is inherited from the first node map type (\c In).
    1.12 +    /// \tparam In The type of the node map for the in-nodes.
    1.13 +    /// \tparam Out The type of the node map for the out-nodes.
    1.14 +    template <typename In, typename Out>
    1.15      class CombinedNodeMap {
    1.16      public:
    1.17  
    1.18        /// The key type of the map
    1.19        typedef Node Key;
    1.20        /// The value type of the map
    1.21 -      typedef typename IN::Value Value;
    1.22 -
    1.23 -      typedef typename MapTraits<IN>::ReferenceMapTag ReferenceMapTag;
    1.24 -      typedef typename MapTraits<IN>::ReturnValue ReturnValue;
    1.25 -      typedef typename MapTraits<IN>::ConstReturnValue ConstReturnValue;
    1.26 -      typedef typename MapTraits<IN>::ReturnValue Reference;
    1.27 -      typedef typename MapTraits<IN>::ConstReturnValue ConstReference;
    1.28 +      typedef typename In::Value Value;
    1.29 +
    1.30 +      typedef typename MapTraits<In>::ReferenceMapTag ReferenceMapTag;
    1.31 +      typedef typename MapTraits<In>::ReturnValue ReturnValue;
    1.32 +      typedef typename MapTraits<In>::ConstReturnValue ConstReturnValue;
    1.33 +      typedef typename MapTraits<In>::ReturnValue Reference;
    1.34 +      typedef typename MapTraits<In>::ConstReturnValue ConstReference;
    1.35  
    1.36        /// Constructor
    1.37 -      CombinedNodeMap(IN& in_map, OUT& out_map)
    1.38 +      CombinedNodeMap(In& in_map, Out& out_map)
    1.39          : _in_map(in_map), _out_map(out_map) {}
    1.40  
    1.41        /// Returns the value associated with the given key.
    1.42 @@ -3497,8 +3497,8 @@
    1.43  
    1.44      private:
    1.45  
    1.46 -      IN& _in_map;
    1.47 -      OUT& _out_map;
    1.48 +      In& _in_map;
    1.49 +      Out& _out_map;
    1.50  
    1.51      };
    1.52  
    1.53 @@ -3506,28 +3506,28 @@
    1.54      /// \brief Returns a combined node map
    1.55      ///
    1.56      /// This function just returns a combined node map.
    1.57 -    template <typename IN, typename OUT>
    1.58 -    static CombinedNodeMap<IN, OUT>
    1.59 -    combinedNodeMap(IN& in_map, OUT& out_map) {
    1.60 -      return CombinedNodeMap<IN, OUT>(in_map, out_map);
    1.61 +    template <typename In, typename Out>
    1.62 +    static CombinedNodeMap<In, Out>
    1.63 +    combinedNodeMap(In& in_map, Out& out_map) {
    1.64 +      return CombinedNodeMap<In, Out>(in_map, out_map);
    1.65      }
    1.66  
    1.67 -    template <typename IN, typename OUT>
    1.68 -    static CombinedNodeMap<const IN, OUT>
    1.69 -    combinedNodeMap(const IN& in_map, OUT& out_map) {
    1.70 -      return CombinedNodeMap<const IN, OUT>(in_map, out_map);
    1.71 +    template <typename In, typename Out>
    1.72 +    static CombinedNodeMap<const In, Out>
    1.73 +    combinedNodeMap(const In& in_map, Out& out_map) {
    1.74 +      return CombinedNodeMap<const In, Out>(in_map, out_map);
    1.75      }
    1.76  
    1.77 -    template <typename IN, typename OUT>
    1.78 -    static CombinedNodeMap<IN, const OUT>
    1.79 -    combinedNodeMap(IN& in_map, const OUT& out_map) {
    1.80 -      return CombinedNodeMap<IN, const OUT>(in_map, out_map);
    1.81 +    template <typename In, typename Out>
    1.82 +    static CombinedNodeMap<In, const Out>
    1.83 +    combinedNodeMap(In& in_map, const Out& out_map) {
    1.84 +      return CombinedNodeMap<In, const Out>(in_map, out_map);
    1.85      }
    1.86  
    1.87 -    template <typename IN, typename OUT>
    1.88 -    static CombinedNodeMap<const IN, const OUT>
    1.89 -    combinedNodeMap(const IN& in_map, const OUT& out_map) {
    1.90 -      return CombinedNodeMap<const IN, const OUT>(in_map, out_map);
    1.91 +    template <typename In, typename Out>
    1.92 +    static CombinedNodeMap<const In, const Out>
    1.93 +    combinedNodeMap(const In& in_map, const Out& out_map) {
    1.94 +      return CombinedNodeMap<const In, const Out>(in_map, out_map);
    1.95      }
    1.96  
    1.97      /// \brief Arc map combined from an arc map and a node map of the