# HG changeset patch # User alpar # Date 1118830784 0 # Node ID ae55ba000ebbde787bfe7a22cf5bd5c6d90aa7a6 # Parent 94535d1833b56ac3bebca4ee4be906210c5e2445 gcc-4.0 compatibility changes coloring.cc still generates warnings. Don't know why. diff -r 94535d1833b5 -r ae55ba000ebb gui/edit_win.cc --- a/gui/edit_win.cc Wed Jun 15 10:13:08 2005 +0000 +++ b/gui/edit_win.cc Wed Jun 15 10:19:44 2005 +0000 @@ -18,7 +18,7 @@ signal_key_press_event().connect(sigc::mem_fun(*this, &EditWin::close_if_escape_is_pressed)); //buttons array - buttons=new (Gtk::RadioButton *) [TOOL_NUM]; + buttons=new Gtk::RadioButton * [TOOL_NUM]; for(int i=0;i(); typename _Graph::Node node_a, node_b; node_a = graph.addNode(); + node_b = graph.addNode(); typename _Graph::Edge edge; edge = graph.addEdge(node_a, node_b); } @@ -927,6 +928,7 @@ checkConcept(); typename _Graph::Node node_a, node_b; node_a = graph.addNode(); + node_b = graph.addNode(); typename _Graph::Edge edge; edge = graph.addEdge(node_a, node_b); } diff -r 94535d1833b5 -r ae55ba000ebb lemon/concept/heap.h --- a/lemon/concept/heap.h Wed Jun 15 10:13:08 2005 +0000 +++ b/lemon/concept/heap.h Wed Jun 15 10:19:44 2005 +0000 @@ -155,6 +155,9 @@ Item item; Prio prio; + item=Item(); + prio=Prio(); + ignore_unused_variable_warning(item); ignore_unused_variable_warning(prio); diff -r 94535d1833b5 -r ae55ba000ebb lemon/graph_to_eps.h --- a/lemon/graph_to_eps.h Wed Jun 15 10:13:08 2005 +0000 +++ b/lemon/graph_to_eps.h Wed Jun 15 10:19:44 2005 +0000 @@ -330,10 +330,10 @@ typedef typename Graph::InEdgeIt InEdgeIt; typedef typename Graph::OutEdgeIt OutEdgeIt; - static const int INTERPOL_PREC=20; - static const double A4HEIGHT = 841.8897637795276; - static const double A4WIDTH = 595.275590551181; - static const double A4BORDER = 15; + static const int INTERPOL_PREC; + static const double A4HEIGHT; + static const double A4WIDTH; + static const double A4BORDER; bool dontPrint; @@ -705,8 +705,9 @@ ctime_r(&tv.tv_sec,cbuf); os << "%%CreationDate: " << cbuf; } - ///\todo: Chech whether the graph is empty. BoundingBox bb; + ///\bug: Chech whether the graph is empty. + if(NodeIt(g)==INVALID) bb+=xy(0,0); for(NodeIt n(g);n!=INVALID;++n) { double ns=_nodeSizes[n]*_nodeScale; xy p(ns,ns); @@ -975,6 +976,15 @@ } }; +template +const int GraphToEps::INTERPOL_PREC = 20; +template +const double GraphToEps::A4HEIGHT = 841.8897637795276; +template +const double GraphToEps::A4WIDTH = 595.275590551181; +template +const double GraphToEps::A4BORDER = 15; + ///Generates an EPS file from a graph diff -r 94535d1833b5 -r ae55ba000ebb lemon/lemon_reader.h --- a/lemon/lemon_reader.h Wed Jun 15 10:13:08 2005 +0000 +++ b/lemon/lemon_reader.h Wed Jun 15 10:19:44 2005 +0000 @@ -310,6 +310,8 @@ reader.attach(*this); } + virtual ~SectionReader() {} + /// \brief Gives back true when the SectionReader can process /// the section with the given header line. /// @@ -571,6 +573,7 @@ class IdReaderBase { public: typedef _Item Item; + virtual ~IdReaderBase() {} virtual Item read(std::istream& is) const = 0; virtual bool isIdReader() const = 0; }; @@ -600,6 +603,7 @@ class ValueReaderBase { public: virtual void read(std::istream&) {}; + virtual ~ValueReaderBase() {} }; template diff -r 94535d1833b5 -r ae55ba000ebb lemon/lemon_writer.h --- a/lemon/lemon_writer.h Wed Jun 15 10:13:08 2005 +0000 +++ b/lemon/lemon_writer.h Wed Jun 15 10:19:44 2005 +0000 @@ -131,6 +131,8 @@ SectionWriter(LemonWriter& writer) { writer.attach(*this); } + + virtual ~SectionWriter() {} /// \brief The header of section. /// @@ -250,6 +252,7 @@ class ValueWriterBase { public: + virtual ~ValueWriterBase() {} virtual void write(std::ostream&) = 0; }; @@ -275,6 +278,7 @@ class IdWriterBase { public: typedef _Item Item; + virtual ~IdWriterBase() {} virtual void write(std::ostream&, const Item&) const = 0; virtual bool isIdWriter() const = 0; }; diff -r 94535d1833b5 -r ae55ba000ebb test/max_matching_test.cc --- a/test/max_matching_test.cc Wed Jun 15 10:13:08 2005 +0000 +++ b/test/max_matching_test.cc Wed Jun 15 10:19:44 2005 +0000 @@ -18,7 +18,7 @@ #include #include #include -#include +#include #include #include "test_tools.h"