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

Timestamp:

04/18/05 16:59:24 (20 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

Location:

src/lemon/concept

Files:

• graph.h (modified) (13 diffs)
• graph_component.h (modified) (7 diffs)
• maps.h (modified) (2 diffs)
• path.h (modified) (11 diffs)
• undir_graph.h (modified) (3 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>

src/lemon/concept/graph_component.h

@@ -305 +305 @@
       /// If the graph does not contain node with the given id
       /// then the result of the function is undetermined. 
-      Node fromId(int id, Node) const { return INVALID;}
+      Node fromId(int , Node) const { return INVALID;}
 
       /// \brief Gives back an unique integer id for the Edge. 
@@ -318 +318 @@
       /// If the graph does not contain edge with the given id
       /// then the result of the function is undetermined. 
-      Edge fromId(int id, Edge) const { return INVALID;}
+      Edge fromId(int, Edge) const { return INVALID;}
 
       template <typename _Graph>
@@ -399 +399 @@
       /// Adds a new Edge connects the two Nodes to the graph.
       ///
-      Edge addEdge(const Node& from, const Node& to) {
+      Edge addEdge(const Node&, const Node&) {
         return INVALID;
       }
@@ -746 +746 @@
       ///
       /// Copy Constructor.
-      GraphMap(const GraphMap&) {}
+      GraphMap(const GraphMap& gm) :ReadWriteMap<Item, _Value>(gm) {}
       
       /// \brief Assign operator.
@@ -810 +810 @@
         ///
         /// Copy Constructor.
-        NodeMap(const NodeMap&) {}
+        NodeMap(const NodeMap& nm) : GraphMap<Graph, Node, _Value>(nm) {}
 
         /// \brief Assign operator.
@@ -840 +840 @@
         ///
         /// Copy Constructor.
-        EdgeMap(const EdgeMap&) {}
+        EdgeMap(const EdgeMap& em) :GraphMap<Graph, Edge, _Value>(em) {}
 
         /// \brief Assign operator.
@@ -918 +918 @@
       ///
       /// Add an edge to the graph and notify the observers.
-      Edge addEdge(const Node& from, const Node& to) {
+      Edge addEdge(const Node&, const Node&) {
         return INVALID;
       }

src/lemon/concept/maps.h

@@ -77 +77 @@
 
       /// Sets the value associated with a key.
-      void set(const Key &k,const Value &t) {}
+      void set(const Key &,const Value &) {}
 
       ///Default constructor
@@ -115 +115 @@
 
       /// Returns the value associated with a key.
-      Value operator[](const Key &k) const {return Value();}
+      Value operator[](const Key &) const {return Value();}
       /// Sets the value associated with a key.
-      void set(const Key &k,const Value &t) {}
+      void set(const Key & ,const Value &) {}
 
       template<typename _ReadWriteMap>

src/lemon/concept/path.h

@@ -55 +55 @@
       /// \param _G The graph in which the path is.
       ///
-      Path(const Graph &_G) {}
+      Path(const Graph &) {}
 
       /// Length of the path.
@@ -87 +87 @@
       /// Returns node iterator pointing to the target node of the
       /// given edge iterator.
-      NodeIt target(const EdgeIt& e) const {return INVALID;}
+      NodeIt target(const EdgeIt&) const {return INVALID;}
 
       /// \brief The source of an edge.
@@ -93 +93 @@
       /// Returns node iterator pointing to the source node of the
       /// given edge iterator.
-      NodeIt source(const EdgeIt& e) const {return INVALID;}
+      NodeIt source(const EdgeIt&) const {return INVALID;}
 
 
@@ -113 +113 @@
         EdgeIt(Invalid) {}
         /// Constructor with starting point
-        EdgeIt(const Path &_p) {}
+        EdgeIt(const Path &) {}
 
         operator GraphEdge () const {}
@@ -121 +121 @@
 
         /// Comparison operator
-        bool operator==(const EdgeIt& e) const {return true;}
-        /// Comparison operator
-        bool operator!=(const EdgeIt& e) const {return true;}
+        bool operator==(const EdgeIt&) const {return true;}
+        /// Comparison operator
+        bool operator!=(const EdgeIt&) const {return true;}
 //      /// Comparison operator
 //      /// \todo It is not clear what is the "natural" ordering.
@@ -145 +145 @@
         NodeIt(Invalid) {}
         /// Constructor with starting point
-        NodeIt(const Path &_p) {}
+        NodeIt(const Path &) {}
 
         ///Conversion to Graph::Node
@@ -153 +153 @@
 
         /// Comparison operator
-        bool operator==(const NodeIt& e) const {return true;}
-        /// Comparison operator
-        bool operator!=(const NodeIt& e) const {return true;}
+        bool operator==(const NodeIt&) const {return true;}
+        /// Comparison operator
+        bool operator!=(const NodeIt&) const {return true;}
 //      /// Comparison operator
 //      /// \todo It is not clear what is the "natural" ordering.
@@ -202 +202 @@
         ///If the path is empty, you \em must call \ref setStartNode() before
         ///the first use of \ref pushFront().
-        void pushFront(const GraphEdge& e) {}
+        void pushFront(const GraphEdge&) {}
 
         ///Push a new edge to the back of the path
@@ -209 +209 @@
         ///If the path is empty, you \em must call \ref setStartNode() before
         ///the first use of \ref pushBack().
-        void pushBack(const GraphEdge& e) {}
+        void pushBack(const GraphEdge&) {}
 
         ///Commit the changes to the path.
@@ -219 +219 @@
         ///to add to the front of the path,
         ///using this function you may speed up the building.
-        void reserveFront(size_t r) {}
+        void reserveFront(size_t) {}
         ///Reserve (back) storage for the builder in advance.
 
@@ -225 +225 @@
         ///to add to the back of the path,
         ///using this function you may speed up the building.
-        void reserveBack(size_t r) {}
+        void reserveBack(size_t) {}
       };
     };

src/lemon/concept/undir_graph.h

@@ -47 +47 @@
 
       /// \e
-      UndirGraphEdge(const UndirGraphEdge&) {}
+      UndirGraphEdge(const UndirGraphEdge& e) : UndirGraph::UndirEdge(e) {}
 
       /// \e
@@ -470 +470 @@
       ///
       /// Returns the base node of the iterator
-      Node baseNode(IncEdgeIt e) const {
+      Node baseNode(IncEdgeIt) const {
         return INVALID;
       }
@@ -476 +476 @@
       ///
       /// Returns the running node of the iterator
-      Node runningNode(IncEdgeIt e) const {
+      Node runningNode(IncEdgeIt) const {
         return INVALID;
       }