Changeset 1494:ae55ba000ebb in lemon-0.x

Timestamp:

06/15/05 12:19:44 (20 years ago)

Author:

Alpar Juttner

Branch:

default

Phase:

public

Convert:

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

Message:

gcc-4.0 compatibility changes
coloring.cc still generates warnings. Don't know why.

Files:

• gui/edit_win.cc (modified) (1 diff)
• lemon/concept/graph_component.h (modified) (2 diffs)
• lemon/concept/heap.h (modified) (1 diff)
• lemon/graph_to_eps.h (modified) (3 diffs)
• lemon/lemon_reader.h (modified) (3 diffs)
• lemon/lemon_writer.h (modified) (3 diffs)
• test/max_matching_test.cc (modified) (1 diff)

gui/edit_win.cc

@@ -19 +19 @@
   
   //buttons array
-  buttons=new (Gtk::RadioButton *) [TOOL_NUM];
+  buttons=new Gtk::RadioButton * [TOOL_NUM];
   for(int i=0;i<TOOL_NUM;i++)
     {

lemon/concept/graph_component.h

@@ -409 +409 @@
           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);
@@ -928 +929 @@
           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);      

lemon/concept/heap.h

@@ -156 +156 @@
           Prio prio;
 
+          item=Item();
+          prio=Prio();
+
           ignore_unused_variable_warning(item);
           ignore_unused_variable_warning(prio);

lemon/graph_to_eps.h

@@ -331 +331 @@
   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;
@@ -706 +706 @@
       os << "%%CreationDate: " << cbuf;
     }
-    ///\todo: Chech whether the graph is empty.
     BoundingBox<double> bb;
+    ///\bug: Chech whether the graph is empty.
+    if(NodeIt(g)==INVALID) bb+=xy<double>(0,0);
     for(NodeIt n(g);n!=INVALID;++n) {
       double ns=_nodeSizes[n]*_nodeScale;
@@ -976 +977 @@
 };
 
+template<class T>
+const int GraphToEps<T>::INTERPOL_PREC = 20;
+template<class T>
+const double GraphToEps<T>::A4HEIGHT = 841.8897637795276;
+template<class T>
+const double GraphToEps<T>::A4WIDTH  = 595.275590551181;
+template<class T>
+const double GraphToEps<T>::A4BORDER = 15;
+
 
 ///Generates an EPS file from a graph

lemon/lemon_reader.h

@@ -311 +311 @@
       }
 
+      virtual ~SectionReader() {}
+
       /// \brief Gives back true when the SectionReader can process 
       /// the section with the given header line.
@@ -572 +574 @@
     public:
       typedef _Item Item;
+      virtual ~IdReaderBase() {}
       virtual Item read(std::istream& is) const = 0;
       virtual bool isIdReader() const = 0;
@@ -601 +604 @@
     public:
       virtual void read(std::istream&) {};
+      virtual ~ValueReaderBase() {}
     };
 

lemon/lemon_writer.h

@@ -132 +132 @@
         writer.attach(*this);
       }
+      
+      virtual ~SectionWriter() {}
 
       /// \brief The header of section.
@@ -251 +253 @@
     class ValueWriterBase {
     public:
+      virtual ~ValueWriterBase() {}
       virtual void write(std::ostream&) = 0;
     };
@@ -276 +279 @@
     public:
       typedef _Item Item;
+      virtual ~IdWriterBase() {}
       virtual void write(std::ostream&, const Item&) const = 0;
       virtual bool isIdWriter() const = 0;

test/max_matching_test.cc

@@ -19 +19 @@
 #include <vector>
 #include <queue>
-#include <math.h>
+#include <cmath>
 #include <cstdlib>