Ticket #83: smart_graph_fix.patch

lemon/bits/graph_extender.h

@@ -367 +367 @@
     }
 
     Node oppositeNode(const Node &n, const Edge &e) const {
-      if( n == Parent::source(e))
-        return Parent::target(e);
-      else if( n == Parent::target(e))
-        return Parent::source(e);
+      if( n == Parent::u(e))
+        return Parent::v(e);
+      else if( n == Parent::v(e))
+        return Parent::u(e);
       else
         return INVALID;
     }
@@ -381 +381 @@
 
     using Parent::direct;
     Arc direct(const Edge &edge, const Node &node) const {
-      return Parent::direct(edge, Parent::source(edge) == node);
+      return Parent::direct(edge, Parent::u(edge) == node);
     }
 
     // Alterable extension
@@ -586 +586 @@
     ///
     /// Returns the base node of the iterator
     Node baseNode(const IncEdgeIt &edge) const {
-      return edge._direction ? source(edge) : target(edge);
+      return edge._direction ? u(edge) : v(edge);
     }
     /// Running node of the iterator
     ///
     /// Returns the running node of the iterator
     Node runningNode(const IncEdgeIt &edge) const {
-      return edge._direction ? target(edge) : source(edge);
+      return edge._direction ? v(edge) : u(edge);
     }
 
     // Mappable extension

lemon/concepts/digraph.h

@@ -467 +467 @@
         }
       };
 
-      template <typename RDigraph>
+      template <typename _Digraph>
       struct Constraints {
         void constraints() {
-          checkConcept<IterableDigraphComponent<>, Digraph>();
-          checkConcept<IDableDigraphComponent<>, Digraph>();
-          checkConcept<MappableDigraphComponent<>, Digraph>();
+          checkConcept<IterableDigraphComponent<>, _Digraph>();
+          checkConcept<IDableDigraphComponent<>, _Digraph>();
+          checkConcept<MappableDigraphComponent<>, _Digraph>();
         }
       };
 

lemon/concepts/graph.h

@@ -731 +731 @@
         return INVALID;
       }
 
-      template <typename Graph>
+      template <typename _Graph>
       struct Constraints {
         void constraints() {
-          checkConcept<IterableGraphComponent<>, Graph>();
-          checkConcept<IDableGraphComponent<>, Graph>();
-          checkConcept<MappableGraphComponent<>, Graph>();
+          checkConcept<IterableGraphComponent<>, _Graph>();
+          checkConcept<IDableGraphComponent<>, _Graph>();
+          checkConcept<MappableGraphComponent<>, _Graph>();
         }
       };
 

lemon/smart_graph.h

@@ -470 +470 @@
     Node source(Arc e) const { return Node(arcs[e._id ^ 1].target); }
     Node target(Arc e) const { return Node(arcs[e._id].target); }
 
-    Node source(Edge e) const { return Node(arcs[2 * e._id].target); }
-    Node target(Edge e) const { return Node(arcs[2 * e._id + 1].target); }
+    Node u(Edge e) const { return Node(arcs[2 * e._id].target); }
+    Node v(Edge e) const { return Node(arcs[2 * e._id + 1].target); }
 
     static bool direction(Arc e) {
       return (e._id & 1) == 1;