Ticket #68: 68-8-afad5d01ef8e.patch

lemon/static_graph.h

@@ -238 +238 @@
 
   protected:
 
-    void fastFirstOut(Arc& e, const Node& n) const {
-      e.id = node_first_out[n.id];
+    int outArcsBegin(const Node& n) const {
+      return node_first_out[n.id];
     }
 
-    static void fastNextOut(Arc& e) {
-      ++e.id;
-    }
-    void fastLastOut(Arc& e, const Node& n) const {
-      e.id = node_first_out[n.id + 1];
+    int outArcsEnd(const Node& n) const {
+      return node_first_out[n.id + 1];
     }
 
   protected:
@@ -404 +401 @@
     void clear() {
       Parent::clear();
     }
-
-  protected:
-
-    using Parent::fastFirstOut;
-    using Parent::fastNextOut;
-    using Parent::fastLastOut;
     
   public:
 
@@ -421 +412 @@
       OutArcIt(Invalid i) : Arc(i) { }
 
       OutArcIt(const StaticDigraph& digraph, const Node& node) {
-        digraph.fastFirstOut(*this, node);
-        digraph.fastLastOut(last, node);
-        if (last == *this) *this = INVALID;
+        id = digraph.outArcsBegin(node);
+        end = digraph.outArcsEnd(node);
+        if (id == end) id = -1;
       }
 
       OutArcIt(const StaticDigraph& digraph, const Arc& arc) : Arc(arc) {
         if (arc != INVALID) {
-          digraph.fastLastOut(last, digraph.source(arc));
+          end = digraph.outArcsEnd(digraph.source(arc));
         }
       }
 
       OutArcIt& operator++() { 
-        StaticDigraph::fastNextOut(*this);
-        if (last == *this) *this = INVALID;
+        id = id+1 != end ? id+1 : -1;
         return *this; 
       }
 
     private:
-      Arc last;
+      int end;
     };
 
     Node baseNode(const OutArcIt &arc) const {