Changeset 2618:6aa6fcaeaea5 in lemon-0.x

Timestamp:

09/19/08 17:14:41 (15 years ago)

Author:

Balazs Dezso

Branch:

default

Phase:

public

Convert:

svn:c9d7d8f5-90d6-0310-b91f-818b3a526b0e/lemon/trunk@3503

Message:

G++-4.3 compatibility changes

Files:

• lemon/bits/bezier.h (modified) (1 diff)
• lemon/bits/traits.h (modified) (2 diffs)
• lemon/circulation.h (modified) (2 diffs)
• lemon/dijkstra.h (modified) (1 diff)
• lemon/edge_set.h (modified) (2 diffs)
• lemon/graph_to_eps.h (modified) (2 diffs)
• lemon/lemon_reader.h (modified) (1 diff)
• lemon/list_graph.h (modified) (2 diffs)
• lemon/lp_base.h (modified) (1 diff)
• lemon/min_mean_cycle.h (modified) (1 diff)
• lemon/preflow.h (modified) (1 diff)
• lemon/random.h (modified) (1 diff)
• test/bipartite_matching_test.cc (modified) (1 diff)
• tools/lgf-gen.cc (modified) (1 diff)

lemon/bits/bezier.h

@@ -35 +35 @@
 class BezierBase {
 public:
-  typedef Point<double> Point;
+  typedef lemon::dim2::Point<double> Point;
 protected:
   static Point conv(Point x,Point y,double t) {return (1-t)*x+t*y;}

lemon/bits/traits.h

@@ -225 +225 @@
     typedef typename Map::Value Value;
 
-    typedef const Value ConstReturnValue;
-    typedef const Value ReturnValue;
+    typedef Value ConstReturnValue;
+    typedef Value ReturnValue;
   };
 
@@ -253 +253 @@
     typedef typename MatrixMap::Value Value;
 
-    typedef const Value ConstReturnValue;
-    typedef const Value ReturnValue;
+    typedef Value ConstReturnValue;
+    typedef Value ReturnValue;
   };
 

lemon/circulation.h

@@ -89 +89 @@
     /// \sa Elevator
     /// \sa LinkedElevator
-    typedef Elevator<Graph, typename Graph::Node> Elevator;
+    typedef lemon::Elevator<Graph, typename Graph::Node> Elevator;
     
     /// \brief Instantiates an Elevator.
@@ -103 +103 @@
     ///
     /// The tolerance used by the algorithm to handle inexact computation.
-    typedef Tolerance<Value> Tolerance;
+    typedef lemon::Tolerance<Value> Tolerance;
 
   };

lemon/dijkstra.h

@@ -31 +31 @@
 #include <lemon/error.h>
 #include <lemon/maps.h>
+
+#include <limits>
 
 

lemon/edge_set.h

@@ -155 +155 @@
       Node node;
       for (first(node); node != INVALID && (*nodes)[node].first_in == -1; 
-           next(node));
+           next(node)) { }
       edge.id = (node == INVALID) ? -1 : (*nodes)[node].first_in;
     }
@@ -165 +165 @@
         Node node = edges[edge.id].target;
         for (next(node); node != INVALID && (*nodes)[node].first_in == -1; 
-             next(node));
+             next(node)) { }
         edge.id = (node == INVALID) ? -1 : (*nodes)[node].first_in;
       }      

lemon/graph_to_eps.h

@@ -1002 +1002 @@
       else for(EdgeIt e(g);e!=INVALID;++e)
         if((!_undirected||g.source(e)<g.target(e))&&_edgeWidths[e]>0
-           &&g.source(e)!=g.target(e))
+           &&g.source(e)!=g.target(e)) {
           if(_drawArrows) {
             dim2::Point<double> d(mycoords[g.target(e)]-mycoords[g.source(e)]);
@@ -1031 +1031 @@
                   << _edgeColors[e].blue() << ' '
                   << _edgeWidths[e]*_edgeWidthScale << " l\n";
+        }
       os << "grestore\n";
     }

lemon/lemon_reader.h

@@ -3473 +3473 @@
         maps.push_back(name);
       }
-      while (getline(is, line));
+      while (getline(is, line)) { }
     }
 

lemon/list_graph.h

@@ -119 +119 @@
       for(n = first_node; 
           n!=-1 && nodes[n].first_in == -1; 
-          n = nodes[n].next);
+          n = nodes[n].next) { }
       e.id = (n == -1) ? -1 : nodes[n].first_in;
     }
@@ -129 +129 @@
         int n;
         for(n = nodes[edges[edge.id].target].next;
-          n!=-1 && nodes[n].first_in == -1; 
-          n = nodes[n].next);
+            n!=-1 && nodes[n].first_in == -1; 
+            n = nodes[n].next) { }
         edge.id = (n == -1) ? -1 : nodes[n].first_in;
       }      

lemon/lp_base.h

@@ -44 +44 @@
   {
     typedef std::numeric_limits<T> Lim;
-    if (Lim::has_infinity && (value == Lim::infinity() || value ==
-          -Lim::infinity()) ||
-        (Lim::has_quiet_NaN || Lim::has_signaling_NaN) && value != value)
+    if ((Lim::has_infinity && (value == Lim::infinity() || value ==
+                               -Lim::infinity())) ||
+        ((Lim::has_quiet_NaN || Lim::has_signaling_NaN) && value != value))
     {
       return false;

lemon/min_mean_cycle.h

@@ -56 +56 @@
 
     typedef typename LengthMap::Value Length;
-    typedef Path<Graph> Path;
+    typedef lemon::Path<Graph> Path;
 
   private:

lemon/preflow.h

@@ -87 +87 @@
     ///
     /// The tolerance used by the algorithm to handle inexact computation.
-    typedef Tolerance<Value> Tolerance;
+    typedef lemon::Tolerance<Value> Tolerance;
 
   };

lemon/random.h

@@ -68 +68 @@
 
 #include <ctime>
+#include <limits>
 
 #include <lemon/math.h>

test/bipartite_matching_test.cc

@@ -196 +196 @@
 
     bpmatch.greedyInit();
-    while (bpmatch.simpleAugment());
+    while (bpmatch.simpleAugment()) { }
     
     Graph::UEdgeMap<bool> mm(graph);

tools/lgf-gen.cc

@@ -121 +121 @@
   do {
     Node n;
-    for(IncEdgeIt e(g,v2);(n=g.runningNode(e))==u2;++e);
+    for(IncEdgeIt e(g,v2);(n=g.runningNode(e))==u2;++e) { }
     u2=v2;
     v2=n;