Changeset 1210:da87dbdf3daf in lemon-main

Timestamp:

07/28/20 21:23:36 (4 years ago)

Author:

Alpar Juttner <alpar@…>

Branch:

default

Phase:

public

Message:

Resolve deprecation warnings of gcc 9 (#633)

Files:

• lemon/concepts/bpgraph.h (modified) (13 diffs)
• lemon/concepts/digraph.h (modified) (8 diffs)
• lemon/concepts/graph.h (modified) (12 diffs)
• lemon/concepts/graph_components.h (modified) (3 diffs)
• lemon/dim2.h (modified) (1 diff)
• lemon/list_graph.h (modified) (2 diffs)
• lemon/maps.h (modified) (1 diff)
• lemon/smart_graph.h (modified) (2 diffs)
• test/maps_test.cc (modified) (1 diff)

lemon/concepts/bpgraph.h

@@ -96 +96 @@
         ///
         Node(const Node&) { }
+        /// Assignment operator
+
+        /// Assignment operator.
+        ///
+        const Node &operator=(const Node&) { return *this; }
 
         /// %Invalid constructor \& conversion.
@@ -144 +149 @@
         ///
         RedNode(const RedNode&) : Node() { }
+        /// Assignment operator
+
+        /// Assignment operator.
+        ///
+        const RedNode &operator=(const RedNode&) { return *this; }
 
         /// %Invalid constructor \& conversion.
@@ -171 +181 @@
         ///
         BlueNode(const BlueNode&) : Node() { }
+        /// Assignment operator
+
+        /// Assignment operator.
+        ///
+        const BlueNode &operator=(const BlueNode&) { return *this; }
+
 
         /// %Invalid constructor \& conversion.
@@ -201 +217 @@
         ///
         RedNodeIt(const RedNodeIt& n) : RedNode(n) { }
+        /// Assignment operator
+
+        /// Assignment operator.
+        ///
+        const RedNodeIt &operator=(const RedNodeIt&) { return *this; }
         /// %Invalid constructor \& conversion.
 
@@ -260 +281 @@
         ///
         BlueNodeIt(const BlueNodeIt& n) : BlueNode(n) { }
+        /// Assignment operator
+
+        /// Assignment operator.
+        ///
+        const BlueNodeIt &operator=(const BlueNodeIt&) { return *this; }
         /// %Invalid constructor \& conversion.
 
@@ -319 +345 @@
         ///
         NodeIt(const NodeIt& n) : Node(n) { }
+        /// Assignment operator
+
+        /// Assignment operator.
+        ///
+        const NodeIt &operator=(const NodeIt&) { return *this; }
         /// %Invalid constructor \& conversion.
 
@@ -375 +406 @@
         ///
         Edge(const Edge&) { }
+        /// Assignment operator
+
+        /// Assignment operator.
+        ///
+        const Edge &operator=(const Edge&) { return *this; }
         /// %Invalid constructor \& conversion.
 
@@ -423 +459 @@
         ///
         EdgeIt(const EdgeIt& e) : Edge(e) { }
+        /// Assignment operator
+
+        /// Assignment operator.
+        ///
+        const EdgeIt &operator=(const EdgeIt&) { return *this; }
         /// %Invalid constructor \& conversion.
 
@@ -488 +529 @@
         ///
         IncEdgeIt(const IncEdgeIt& e) : Edge(e) { }
+        /// Assignment operator
+
+        /// Assignment operator.
+        ///
+        const IncEdgeIt &operator=(const IncEdgeIt&) { return *this; }
         /// %Invalid constructor \& conversion.
 
@@ -546 +592 @@
         ///
         Arc(const Arc&) { }
+        /// Assignment operator
+
+        /// Assignment operator.
+        ///
+        const Arc &operator=(const Arc&) { return *this; }
         /// %Invalid constructor \& conversion.
 
@@ -600 +651 @@
         ///
         ArcIt(const ArcIt& e) : Arc(e) { }
+        /// Assignment operator
+
+        /// Assignment operator.
+        ///
+        const ArcIt &operator=(const ArcIt&) { return *this; }
         /// %Invalid constructor \& conversion.
 
@@ -665 +721 @@
         ///
         OutArcIt(const OutArcIt& e) : Arc(e) { }
+        /// Assignment operator
+
+        /// Assignment operator.
+        ///
+        const OutArcIt &operator=(const OutArcIt&) { return *this; }
         /// %Invalid constructor \& conversion.
 
@@ -731 +792 @@
         ///
         InArcIt(const InArcIt& e) : Arc(e) { }
+        /// Assignment operator
+
+        /// Assignment operator.
+        ///
+        const InArcIt &operator=(const InArcIt&) { return *this; }
         /// %Invalid constructor \& conversion.
 

lemon/concepts/digraph.h

@@ -78 +78 @@
         Node(const Node&) { }
 
+        /// Assignment operator
+
+        /// Assignment operator.
+        ///
+        const Node &operator=(const Node&) { return *this; }
+
         /// %Invalid constructor \& conversion.
 
@@ -127 +133 @@
         ///
         NodeIt(const NodeIt& n) : Node(n) { }
+        /// Assignment operator
+
+        /// Assignment operator.
+        ///
+        const NodeIt &operator=(const NodeIt&) { return *this; }
+
         /// %Invalid constructor \& conversion.
 
@@ -186 +198 @@
         ///
         Arc(const Arc&) { }
+        /// Assignment operator
+
+        /// Assignment operator.
+        ///
+        const Arc &operator=(const Arc&) { return *this; }
+
         /// %Invalid constructor \& conversion.
 
@@ -236 +254 @@
         ///
         OutArcIt(const OutArcIt& e) : Arc(e) { }
+        /// Assignment operator
+
+        /// Assignment operator.
+        ///
+        const OutArcIt &operator=(const OutArcIt&) { return *this; }
         /// %Invalid constructor \& conversion.
 
@@ -302 +325 @@
         ///
         InArcIt(const InArcIt& e) : Arc(e) { }
+        /// Assignment operator
+
+        /// Assignment operator.
+        ///
+        const InArcIt &operator=(const InArcIt&) { return *this; }
+
         /// %Invalid constructor \& conversion.
 
@@ -366 +395 @@
         ///
         ArcIt(const ArcIt& e) : Arc(e) { }
+        /// Assignment operator
+
+        /// Assignment operator.
+        ///
+        const ArcIt &operator=(const ArcIt&) { return *this; }
+
         /// %Invalid constructor \& conversion.
 
@@ -522 +557 @@
         NodeMap(const NodeMap& nm) :
           ReferenceMap<Node, T, T&, const T&>(nm) { }
+      public:
         ///Assignment operator
+        NodeMap& operator=(const NodeMap&) {
+          return *this;
+        }
+        ///Template Assignment operator
         template <typename CMap>
         NodeMap& operator=(const CMap&) {
@@ -548 +588 @@
           ReferenceMap<Arc, T, T&, const T&>(em) { }
         ///Assignment operator
+        ArcMap& operator=(const ArcMap&) {
+          return *this;
+        }
+        ///Template Assignment operator
         template <typename CMap>
         ArcMap& operator=(const CMap&) {

lemon/concepts/graph.h

@@ -109 +109 @@
         ///
         Node(const Node&) { }
+        /// Assignment operator
+
+        /// Assignment operator.
+        ///
+        const Node &operator=(const Node&) { return *this; }
 
         /// %Invalid constructor \& conversion.
@@ -160 +165 @@
         ///
         NodeIt(const NodeIt& n) : Node(n) { }
+        /// Assignment operator
+
+        /// Assignment operator.
+        ///
+        const NodeIt &operator=(const NodeIt&) { return *this; }
+
         /// %Invalid constructor \& conversion.
 
@@ -219 +230 @@
         ///
         Edge(const Edge&) { }
+        /// Assignment operator
+
+        /// Assignment operator.
+        ///
+        const Edge &operator=(const Edge&) { return *this; }
+
         /// %Invalid constructor \& conversion.
 
@@ -267 +284 @@
         ///
         EdgeIt(const EdgeIt& e) : Edge(e) { }
+        /// Assignment operator
+
+        /// Assignment operator.
+        ///
+        const EdgeIt &operator=(const EdgeIt&) { return *this; }
+
         /// %Invalid constructor \& conversion.
 
@@ -336 +359 @@
         ///
         IncEdgeIt(const IncEdgeIt& e) : Edge(e) { }
+        /// Assignment operator
+
+        /// Assignment operator.
+        ///
+        const IncEdgeIt &operator=(const IncEdgeIt&) { return *this; }
+
         /// %Invalid constructor \& conversion.
 
@@ -397 +426 @@
         ///
         Arc(const Arc&) { }
+        /// Assignment operator
+
+        /// Assignment operator.
+        ///
+        const Arc &operator=(const Arc&) { return *this; }
+
         /// %Invalid constructor \& conversion.
 
@@ -451 +486 @@
         ///
         ArcIt(const ArcIt& e) : Arc(e) { }
+        /// Assignment operator
+
+        /// Assignment operator.
+        ///
+        const ArcIt &operator=(const ArcIt&) { return *this; }
+
         /// %Invalid constructor \& conversion.
 
@@ -519 +560 @@
         ///
         OutArcIt(const OutArcIt& e) : Arc(e) { }
+        /// Assignment operator
+
+        /// Assignment operator.
+        ///
+        const OutArcIt &operator=(const OutArcIt&) { return *this; }
+
         /// %Invalid constructor \& conversion.
 
@@ -588 +635 @@
         ///
         InArcIt(const InArcIt& e) : Arc(e) { }
+        /// Assignment operator
+
+        /// Assignment operator.
+        ///
+        const InArcIt &operator=(const InArcIt&) { return *this; }
+
         /// %Invalid constructor \& conversion.
 
@@ -652 +705 @@
           ReferenceMap<Node, T, T&, const T&>(nm) { }
         ///Assignment operator
+        NodeMap& operator=(const NodeMap&) {
+          return *this;
+        }
+        ///Template Assignment operator
         template <typename CMap>
         NodeMap& operator=(const CMap&) {
@@ -678 +735 @@
           ReferenceMap<Arc, T, T&, const T&>(em) { }
         ///Assignment operator
+        ArcMap& operator=(const ArcMap&) {
+          return *this;
+        }
+        ///Template Assignment operator
         template <typename CMap>
         ArcMap& operator=(const CMap&) {
@@ -704 +765 @@
           ReferenceMap<Edge, T, T&, const T&>(em) {}
         ///Assignment operator
+        EdgeMap& operator=(const EdgeMap&) {
+          return *this;
+        }
+        ///Template Assignment operator
         template <typename CMap>
         EdgeMap& operator=(const CMap&) {

lemon/concepts/graph_components.h

@@ -220 +220 @@
         Edge(const Edge &) : Parent() {}
 
+        /// Assignment operator
+
+        /// Assignment operator.
+        ///
+        const Edge &operator=(const Edge&) { return *this; }
+
         /// \brief Constructor for conversion from \c INVALID.
         ///
@@ -337 +343 @@
         /// Copy constructor.
         RedNode(const RedNode &) : Parent() {}
+        /// Assignment operator
+
+        /// Assignment operator.
+        ///
+        const RedNode &operator=(const RedNode&) { return *this; }
 
         /// \brief Constructor for conversion from \c INVALID.
@@ -366 +377 @@
         /// Copy constructor.
         BlueNode(const BlueNode &) : Parent() {}
+        /// Assignment operator
+
+        /// Assignment operator.
+        ///
+        const BlueNode &operator=(const BlueNode&) { return *this; }
+
 
         /// \brief Constructor for conversion from \c INVALID.

lemon/dim2.h

@@ -55 +55 @@
 
       ///Default constructor
-      Point() {}
+      Point() : x(), y() {}
 
       ///Construct an instance from coordinates

lemon/list_graph.h

@@ -1658 +1658 @@
       RedNode(const RedNode& node) : Node(node) {}
       RedNode(Invalid) : Node(INVALID){}
+      const RedNode& operator=(const RedNode& node) { Node::operator=(node); return *this;}
     };
 
@@ -1670 +1671 @@
       BlueNode(const BlueNode& node) : Node(node) {}
       BlueNode(Invalid) : Node(INVALID){}
+      const BlueNode& operator=(const BlueNode& node) { Node::operator=(node); return *this;}
     };
 

lemon/maps.h

@@ -295 +295 @@
   private:
 
-    RangeMap& operator=(const RangeMap&);
-
-  public:
+    // RangeMap& operator=(const RangeMap&);
+
+  public:
+
+    // ///\e
+    // RangeMap(const RangeMap&);
 
     ///\e

lemon/smart_graph.h

@@ -864 +864 @@
       RedNode() {}
       RedNode(const RedNode& node) : Node(node) {}
-      RedNode(Invalid) : Node(INVALID){}
+      RedNode(Invalid) : Node(INVALID) {}
+      const RedNode& operator=(const RedNode& node) { Node::operator=(node); return *this;}
     };
 
@@ -877 +878 @@
       BlueNode(const BlueNode& node) : Node(node) {}
       BlueNode(Invalid) : Node(INVALID){}
+      const BlueNode& operator=(const BlueNode& node) { Node::operator=(node); return *this;}
     };
 

test/maps_test.cc

@@ -62 +62 @@
   typedef B result_type;
 
+  F() {};
+  F(const F&) {};
+
   B operator()(const A&) const { return B(); }
 private: