Changeset 1643:9285f3777553 in lemon-0.x for lemon

Timestamp:

08/18/05 15:33:49 (19 years ago)

Author:

Alpar Juttner

Branch:

default

Phase:

public

Convert:

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

Message:

• The number of gcc-4.0 warnings has significantly decreases.
• Some code clean-up in gui

Location:

lemon

Files:

• concept/graph.h (modified) (1 diff)
• concept/path.h (modified) (2 diffs)
• concept/undir_graph.h (modified) (3 diffs)
• full_graph.h (modified) (2 diffs)

lemon/concept/graph.h

@@ -405 +405 @@
         /// This constructor sets the iterator to the first edge of \c g.
         ///@param g the graph
-        EdgeIt(const StaticGraph& g) { }
+        EdgeIt(const StaticGraph& g) { ignore_unused_variable_warning(g); }
         /// Edge -> EdgeIt conversion
 

lemon/concept/path.h

@@ -25 +25 @@
 
 #include <lemon/invalid.h>
+#include <lemon/concept_check.h>
 
 namespace lemon {
@@ -55 +56 @@
       /// \param _g The graph in which the path is.
       ///
-      Path(const Graph &_g) {}
+      Path(const Graph &_g) {
+        ignore_unused_variable_warning(_g);
+      }
 
       /// Length of the path.

lemon/concept/undir_graph.h

@@ -558 +558 @@
         /// This constructor sets the iterator to the first edge of \c g.
         ///@param g the graph
-        EdgeIt(const UndirGraph &g) { }
+        EdgeIt(const UndirGraph &g) { ignore_unused_variable_warning(g); }
         /// Edge -> EdgeIt conversion
 
@@ -606 +606 @@
         ///@param n the node
         ///@param g the graph
-        OutEdgeIt(const UndirGraph& n, const Node& g) { }
+        OutEdgeIt(const UndirGraph& n, const Node& g) {
+          ignore_unused_variable_warning(n);
+          ignore_unused_variable_warning(g);
+        }
         /// Edge -> OutEdgeIt conversion
 
@@ -655 +658 @@
         ///@param n the node
         ///@param g the graph
-        InEdgeIt(const UndirGraph& g, const Node& n) { }
+        InEdgeIt(const UndirGraph& g, const Node& n) { 
+          ignore_unused_variable_warning(n);
+          ignore_unused_variable_warning(g);
+        }
         /// Edge -> InEdgeIt conversion
 

lemon/full_graph.h

@@ -126 +126 @@
     protected:
       int id;
-      Node(int _id) { id = _id;}
+      Node(int _id) : id(_id) {}
     public:
       Node() {}
-      Node (Invalid) { id = -1; }
+      Node (Invalid) : id(-1) {}
       bool operator==(const Node node) const {return id == node.id;}
       bool operator!=(const Node node) const {return id != node.id;}
@@ -261 +261 @@
     Node source(Edge e) const { 
       /// \todo we may do it faster
-      return ((int)sqrt((double)(1 + 8 * e.id)) + 1) / 2; 
+      return Node(((int)sqrt((double)(1 + 8 * e.id)) + 1) / 2);
     }
 
     Node target(Edge e) const { 
       int source = ((int)sqrt((double)(1 + 8 * e.id)) + 1) / 2;;
-      return e.id - (source) * (source - 1) / 2; 
+      return Node(e.id - (source) * (source - 1) / 2);
     }