Changeset 1367:a490662291b9 in lemon-0.x for src/lemon/concept/graph.h

Timestamp:

04/18/05 16:59:24 (19 years ago)

Author:

Alpar Juttner

Branch:

default

Phase:

public

Convert:

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

Message:

More steps toward gcc-3.4 compatibility

File:

• src/lemon/concept/graph.h (modified) (13 diffs)

src/lemon/concept/graph.h

@@ -186 +186 @@
         /// Copy constructor.
         ///
-        NodeIt(const NodeIt&) { }
+        NodeIt(const NodeIt& n) : Node(n) { }
         /// Invalid constructor \& conversion.
 
@@ -196 +196 @@
         /// Sets the iterator to the first node of \c g.
         ///
-        NodeIt(const StaticGraph& g) { }
+        NodeIt(const StaticGraph&) { }
         /// Node -> NodeIt conversion.
 
@@ -268 +268 @@
         /// Copy constructor.
         ///
-        OutEdgeIt(const OutEdgeIt&) { }
+        OutEdgeIt(const OutEdgeIt& e) : Edge(e) { }
         /// Initialize the iterator to be invalid.
 
@@ -280 +280 @@
         ///@param n the node
         ///@param g the graph
-        OutEdgeIt(const StaticGraph& g, const Node& n) { }
+        OutEdgeIt(const StaticGraph&, const Node&) { }
         /// Edge -> OutEdgeIt conversion
 
@@ -317 +317 @@
         /// Copy constructor.
         ///
-        InEdgeIt(const InEdgeIt&) { }
+        InEdgeIt(const InEdgeIt& e) : Edge(e) { }
         /// Initialize the iterator to be invalid.
 
@@ -329 +329 @@
         ///@param n the node
         ///@param g the graph
-        InEdgeIt(const StaticGraph& g, const Node& n) { }
+        InEdgeIt(const StaticGraph&, const Node&) { }
         /// Edge -> InEdgeIt conversion
 
@@ -335 +335 @@
         /// This feature necessitates that each time we 
         /// iterate the edge-set, the iteration order is the same.
-        InEdgeIt(const StaticGraph& g, const Edge& n) { }
+        InEdgeIt(const StaticGraph&, const Edge&) { }
         /// Next incoming edge
 
@@ -362 +362 @@
         /// Copy constructor.
         ///
-        EdgeIt(const EdgeIt&) { }
+        EdgeIt(const EdgeIt& e) : Edge(e) { }
         /// Initialize the iterator to be invalid.
 
@@ -373 +373 @@
         /// node
         ///@param g the graph
-        EdgeIt(const StaticGraph& g) { }
+        EdgeIt(const StaticGraph&) { }
         /// Edge -> EdgeIt conversion
 
@@ -414 +414 @@
 
         ///Copy constructor
-        NodeMap(const NodeMap&) { }
+        NodeMap(const NodeMap& nm) : ReadWriteMap< Node, T >(nm) { }
         ///Assignment operator
         NodeMap& operator=(const NodeMap&) { return *this; }
@@ -437 +437 @@
         EdgeMap(const StaticGraph&, T) { }
         ///Copy constructor
-        EdgeMap(const EdgeMap&) { }
+        EdgeMap(const EdgeMap& em) : ReadWriteMap<Edge,T>(em) { }
         ///Assignment operator
         EdgeMap& operator=(const EdgeMap&) { return *this; }
@@ -471 +471 @@
       ///and target node \c t.
       ///\return the new edge.
-      Edge addEdge(Node s, Node t) { return INVALID; }
+      Edge addEdge(Node, Node) { return INVALID; }
     
       /// Resets the graph.
@@ -501 +501 @@
       /// Deletes node \c n node.
       ///
-      void erase(Node n) { }
+      void erase(Node) { }
       /// Deletes an edge.
 
       /// Deletes edge \c e edge.
       ///
-      void erase(Edge e) { }
+      void erase(Edge) { }
 
       template <typename _Graph>