COIN-OR::LEMON - Graph Library

Changeset 184:716b220697a0 in lemon


Ignore:
Timestamp:
03/27/08 16:27:23 (12 years ago)
Author:
Alpar Juttner <alpar@…>
Branch:
default
Phase:
public
Message:

Fix gcc-4.3 compilation errors and warnings

Files:
6 edited

Legend:

Unmodified
Added
Removed
  • lemon/bits/bezier.h

    r157 r184  
    3333class BezierBase {
    3434public:
    35   typedef Point<double> Point;
     35  typedef lemon::dim2::Point<double> Point;
    3636protected:
    3737  static Point conv(Point x,Point y,double t) {return (1-t)*x+t*y;}
  • lemon/bits/traits.h

    r139 r184  
    151151    typedef typename Map::Value Value;
    152152
    153     typedef const Value ConstReturnValue;
    154     typedef const Value ReturnValue;
     153    typedef Value ConstReturnValue;
     154    typedef Value ReturnValue;
    155155  };
    156156
     
    179179    typedef typename MatrixMap::Value Value;
    180180
    181     typedef const Value ConstReturnValue;
    182     typedef const Value ReturnValue;
     181    typedef Value ConstReturnValue;
     182    typedef Value ReturnValue;
    183183  };
    184184
  • lemon/dijkstra.h

    r169 r184  
    2424///\brief Dijkstra algorithm.
    2525
     26#include <limits>
    2627#include <lemon/list_graph.h>
    2728#include <lemon/bin_heap.h>
  • lemon/graph_to_eps.h

    r157 r184  
    10161016      else for(ArcIt e(g);e!=INVALID;++e)
    10171017        if((!_undirected||g.source(e)<g.target(e))&&_arcWidths[e]>0
    1018            &&g.source(e)!=g.target(e))
     1018           &&g.source(e)!=g.target(e)) {
    10191019          if(_drawArrows) {
    10201020            dim2::Point<double> d(mycoords[g.target(e)]-mycoords[g.source(e)]);
     
    10361036               << _arcColors[e].green() << ' '
    10371037               << _arcColors[e].blue() << " arr\n";
    1038           }
     1038          } 
    10391039          else os << mycoords[g.source(e)].x << ' '
    10401040                  << mycoords[g.source(e)].y << ' '
     
    10451045                  << _arcColors[e].blue() << ' '
    10461046                  << _arcWidths[e]*_arcWidthScale << " l\n";
     1047        }
    10471048      os << "grestore\n";
    10481049    }
  • lemon/list_graph.h

    r149 r184  
    116116      for(n = first_node;
    117117          n!=-1 && nodes[n].first_in == -1;
    118           n = nodes[n].next);
     118          n = nodes[n].next) {}
    119119      arc.id = (n == -1) ? -1 : nodes[n].first_in;
    120120    }
     
    126126        int n;
    127127        for(n = nodes[arcs[arc.id].target].next;
    128           n!=-1 && nodes[n].first_in == -1;
    129           n = nodes[n].next);
     128            n!=-1 && nodes[n].first_in == -1;
     129            n = nodes[n].next) {}
    130130        arc.id = (n == -1) ? -1 : nodes[n].first_in;
    131131      }     
  • test/test_tools.h

    r171 r184  
    2525
    2626#include <iostream>
     27#include <stdlib.h>
    2728
    2829///If \c rc is fail, writes an error message and exits.
     
    3738///print something like this (and then exits).
    3839///\verbatim file_name.cc:123: error: This is obviously false. \endverbatim
    39 ///
    40 ///\todo It should be in \c assert.h
    4140#define check(rc, msg) \
    4241  if(!(rc)) { \
Note: See TracChangeset for help on using the changeset viewer.