Changeset 184:716b220697a0 in lemon-main

Timestamp:

03/27/08 16:27:23 (17 years ago)

Author:

Alpar Juttner <alpar@…>

Branch:

default

Phase:

public

Message:

Fix gcc-4.3 compilation errors and warnings

Files:

• lemon/bits/bezier.h (modified) (1 diff)
• lemon/bits/traits.h (modified) (2 diffs)
• lemon/dijkstra.h (modified) (1 diff)
• lemon/graph_to_eps.h (modified) (3 diffs)
• lemon/list_graph.h (modified) (2 diffs)
• test/test_tools.h (modified) (2 diffs)

lemon/bits/bezier.h

@@ -33 +33 @@
 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

@@ -151 +151 @@
     typedef typename Map::Value Value;
 
-    typedef const Value ConstReturnValue;
-    typedef const Value ReturnValue;
+    typedef Value ConstReturnValue;
+    typedef Value ReturnValue;
   };
 
@@ -179 +179 @@
     typedef typename MatrixMap::Value Value;
 
-    typedef const Value ConstReturnValue;
-    typedef const Value ReturnValue;
+    typedef Value ConstReturnValue;
+    typedef Value ReturnValue;
   };
 

lemon/dijkstra.h

@@ -24 +24 @@
 ///\brief Dijkstra algorithm.
 
+#include <limits>
 #include <lemon/list_graph.h>
 #include <lemon/bin_heap.h>

lemon/graph_to_eps.h

@@ -1016 +1016 @@
       else for(ArcIt e(g);e!=INVALID;++e)
         if((!_undirected||g.source(e)<g.target(e))&&_arcWidths[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)]);
@@ -1036 +1036 @@
                << _arcColors[e].green() << ' '
                << _arcColors[e].blue() << " arr\n";
-          }
+          } 
           else os << mycoords[g.source(e)].x << ' '
                   << mycoords[g.source(e)].y << ' '
@@ -1045 +1045 @@
                   << _arcColors[e].blue() << ' '
                   << _arcWidths[e]*_arcWidthScale << " l\n";
+        }
       os << "grestore\n";
     }

lemon/list_graph.h

@@ -116 +116 @@
       for(n = first_node; 
           n!=-1 && nodes[n].first_in == -1; 
-          n = nodes[n].next);
+          n = nodes[n].next) {}
       arc.id = (n == -1) ? -1 : nodes[n].first_in;
     }
@@ -126 +126 @@
         int n;
         for(n = nodes[arcs[arc.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) {}
         arc.id = (n == -1) ? -1 : nodes[n].first_in;
       }      

test/test_tools.h

@@ -25 +25 @@
 
 #include <iostream>
+#include <stdlib.h>
 
 ///If \c rc is fail, writes an error message and exits.
@@ -37 +38 @@
 ///print something like this (and then exits).
 ///\verbatim file_name.cc:123: error: This is obviously false. \endverbatim
-///
-///\todo It should be in \c assert.h
 #define check(rc, msg) \
   if(!(rc)) { \