Ticket #365: windows_h_fix_1.1.patch

lemon/adaptors.h

@@ -3422 +3422 @@
     ///
     /// 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 <typename IN, typename OUT>
+    /// Its value type is inherited from the first node map type (\c IM).
+    /// \tparam IM The type of the node map for the in-nodes. 
+    /// \tparam OM The type of the node map for the out-nodes.
+    template <typename IM, typename OM>
     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<IN>::ReferenceMapTag ReferenceMapTag;
-      typedef typename MapTraits<IN>::ReturnValue ReturnValue;
-      typedef typename MapTraits<IN>::ConstReturnValue ConstReturnValue;
-      typedef typename MapTraits<IN>::ReturnValue Reference;
-      typedef typename MapTraits<IN>::ConstReturnValue ConstReference;
+      typedef typename IM::Value Value;
+
+      typedef typename MapTraits<IM>::ReferenceMapTag ReferenceMapTag;
+      typedef typename MapTraits<IM>::ReturnValue ReturnValue;
+      typedef typename MapTraits<IM>::ConstReturnValue ConstReturnValue;
+      typedef typename MapTraits<IM>::ReturnValue Reference;
+      typedef typename MapTraits<IM>::ConstReturnValue ConstReference;
 
       /// Constructor
-      CombinedNodeMap(IN& in_map, OUT& out_map)
+      CombinedNodeMap(IM& in_map, OM& out_map)
         : _in_map(in_map), _out_map(out_map) {}
 
       /// Returns the value associated with the given key.
@@ -3473 +3473 @@
 
     private:
 
-      IN& _in_map;
-      OUT& _out_map;
+      IM& _in_map;
+      OM& _out_map;
 
     };
 
@@ -3482 +3482 @@
     /// \brief Returns a combined node map
     ///
     /// This function just returns a combined node map.
-    template <typename IN, typename OUT>
-    static CombinedNodeMap<IN, OUT>
-    combinedNodeMap(IN& in_map, OUT& out_map) {
-      return CombinedNodeMap<IN, OUT>(in_map, out_map);
+    template <typename IM, typename OM>
+    static CombinedNodeMap<IM, OM>
+    combinedNodeMap(IM& in_map, OM& out_map) {
+      return CombinedNodeMap<IM, OM>(in_map, out_map);
     }
 
-    template <typename IN, typename OUT>
-    static CombinedNodeMap<const IN, OUT>
-    combinedNodeMap(const IN& in_map, OUT& out_map) {
-      return CombinedNodeMap<const IN, OUT>(in_map, out_map);
+    template <typename IM, typename OM>
+    static CombinedNodeMap<const IM, OM>
+    combinedNodeMap(const IM& in_map, OM& out_map) {
+      return CombinedNodeMap<const IM, OM>(in_map, out_map);
     }
 
-    template <typename IN, typename OUT>
-    static CombinedNodeMap<IN, const OUT>
-    combinedNodeMap(IN& in_map, const OUT& out_map) {
-      return CombinedNodeMap<IN, const OUT>(in_map, out_map);
+    template <typename IM, typename OM>
+    static CombinedNodeMap<IM, const OM>
+    combinedNodeMap(IM& in_map, const OM& out_map) {
+      return CombinedNodeMap<IM, const OM>(in_map, out_map);
     }
 
-    template <typename IN, typename OUT>
-    static CombinedNodeMap<const IN, const OUT>
-    combinedNodeMap(const IN& in_map, const OUT& out_map) {
-      return CombinedNodeMap<const IN, const OUT>(in_map, out_map);
+    template <typename IM, typename OM>
+    static CombinedNodeMap<const IM, const OM>
+    combinedNodeMap(const IM& in_map, const OM& out_map) {
+      return CombinedNodeMap<const IM, const OM>(in_map, out_map);
     }
 
     /// \brief Arc map combined from an arc map and a node map of the