# HG changeset patch
# Parent 4790f64d6f51834e7bee1670bf4861ff483e9076
Resolve deprecation warnings of gcc 9
diff --git a/lemon/concepts/bpgraph.h b/lemon/concepts/bpgraph.h
|
a
|
b
|
|
| 95 | 95 | /// Copy constructor. |
| 96 | 96 | /// |
| 97 | 97 | Node(const Node&) { } |
| | 98 | /// Assignment operator |
| | 99 | |
| | 100 | /// Assignment operator. |
| | 101 | /// |
| | 102 | const Node &operator=(const Node&) { return *this; } |
| 98 | 103 | |
| 99 | 104 | /// %Invalid constructor \& conversion. |
| 100 | 105 | |
| … |
… |
|
| 143 | 148 | /// Copy constructor. |
| 144 | 149 | /// |
| 145 | 150 | RedNode(const RedNode&) : Node() { } |
| | 151 | /// Assignment operator |
| | 152 | |
| | 153 | /// Assignment operator. |
| | 154 | /// |
| | 155 | const RedNode &operator=(const RedNode&) { return *this; } |
| 146 | 156 | |
| 147 | 157 | /// %Invalid constructor \& conversion. |
| 148 | 158 | |
| … |
… |
|
| 170 | 180 | /// Copy constructor. |
| 171 | 181 | /// |
| 172 | 182 | BlueNode(const BlueNode&) : Node() { } |
| | 183 | /// Assignment operator |
| | 184 | |
| | 185 | /// Assignment operator. |
| | 186 | /// |
| | 187 | const BlueNode &operator=(const BlueNode&) { return *this; } |
| | 188 | |
| 173 | 189 | |
| 174 | 190 | /// %Invalid constructor \& conversion. |
| 175 | 191 | |
| … |
… |
|
| 200 | 216 | /// Copy constructor. |
| 201 | 217 | /// |
| 202 | 218 | RedNodeIt(const RedNodeIt& n) : RedNode(n) { } |
| | 219 | /// Assignment operator |
| | 220 | |
| | 221 | /// Assignment operator. |
| | 222 | /// |
| | 223 | const RedNodeIt &operator=(const RedNodeIt&) { return *this; } |
| 203 | 224 | /// %Invalid constructor \& conversion. |
| 204 | 225 | |
| 205 | 226 | /// Initializes the iterator to be invalid. |
| … |
… |
|
| 259 | 280 | /// Copy constructor. |
| 260 | 281 | /// |
| 261 | 282 | BlueNodeIt(const BlueNodeIt& n) : BlueNode(n) { } |
| | 283 | /// Assignment operator |
| | 284 | |
| | 285 | /// Assignment operator. |
| | 286 | /// |
| | 287 | const BlueNodeIt &operator=(const BlueNodeIt&) { return *this; } |
| 262 | 288 | /// %Invalid constructor \& conversion. |
| 263 | 289 | |
| 264 | 290 | /// Initializes the iterator to be invalid. |
| … |
… |
|
| 318 | 344 | /// Copy constructor. |
| 319 | 345 | /// |
| 320 | 346 | NodeIt(const NodeIt& n) : Node(n) { } |
| | 347 | /// Assignment operator |
| | 348 | |
| | 349 | /// Assignment operator. |
| | 350 | /// |
| | 351 | const NodeIt &operator=(const NodeIt&) { return *this; } |
| 321 | 352 | /// %Invalid constructor \& conversion. |
| 322 | 353 | |
| 323 | 354 | /// Initializes the iterator to be invalid. |
| … |
… |
|
| 374 | 405 | /// Copy constructor. |
| 375 | 406 | /// |
| 376 | 407 | Edge(const Edge&) { } |
| | 408 | /// Assignment operator |
| | 409 | |
| | 410 | /// Assignment operator. |
| | 411 | /// |
| | 412 | const Edge &operator=(const Edge&) { return *this; } |
| 377 | 413 | /// %Invalid constructor \& conversion. |
| 378 | 414 | |
| 379 | 415 | /// Initializes the object to be invalid. |
| … |
… |
|
| 422 | 458 | /// Copy constructor. |
| 423 | 459 | /// |
| 424 | 460 | EdgeIt(const EdgeIt& e) : Edge(e) { } |
| | 461 | /// Assignment operator |
| | 462 | |
| | 463 | /// Assignment operator. |
| | 464 | /// |
| | 465 | const EdgeIt &operator=(const EdgeIt&) { return *this; } |
| 425 | 466 | /// %Invalid constructor \& conversion. |
| 426 | 467 | |
| 427 | 468 | /// Initializes the iterator to be invalid. |
| … |
… |
|
| 487 | 528 | /// Copy constructor. |
| 488 | 529 | /// |
| 489 | 530 | IncEdgeIt(const IncEdgeIt& e) : Edge(e) { } |
| | 531 | /// Assignment operator |
| | 532 | |
| | 533 | /// Assignment operator. |
| | 534 | /// |
| | 535 | const IncEdgeIt &operator=(const IncEdgeIt&) { return *this; } |
| 490 | 536 | /// %Invalid constructor \& conversion. |
| 491 | 537 | |
| 492 | 538 | /// Initializes the iterator to be invalid. |
| … |
… |
|
| 545 | 591 | /// Copy constructor. |
| 546 | 592 | /// |
| 547 | 593 | Arc(const Arc&) { } |
| | 594 | /// Assignment operator |
| | 595 | |
| | 596 | /// Assignment operator. |
| | 597 | /// |
| | 598 | const Arc &operator=(const Arc&) { return *this; } |
| 548 | 599 | /// %Invalid constructor \& conversion. |
| 549 | 600 | |
| 550 | 601 | /// Initializes the object to be invalid. |
| … |
… |
|
| 599 | 650 | /// Copy constructor. |
| 600 | 651 | /// |
| 601 | 652 | ArcIt(const ArcIt& e) : Arc(e) { } |
| | 653 | /// Assignment operator |
| | 654 | |
| | 655 | /// Assignment operator. |
| | 656 | /// |
| | 657 | const ArcIt &operator=(const ArcIt&) { return *this; } |
| 602 | 658 | /// %Invalid constructor \& conversion. |
| 603 | 659 | |
| 604 | 660 | /// Initializes the iterator to be invalid. |
| … |
… |
|
| 664 | 720 | /// Copy constructor. |
| 665 | 721 | /// |
| 666 | 722 | OutArcIt(const OutArcIt& e) : Arc(e) { } |
| | 723 | /// Assignment operator |
| | 724 | |
| | 725 | /// Assignment operator. |
| | 726 | /// |
| | 727 | const OutArcIt &operator=(const OutArcIt&) { return *this; } |
| 667 | 728 | /// %Invalid constructor \& conversion. |
| 668 | 729 | |
| 669 | 730 | /// Initializes the iterator to be invalid. |
| … |
… |
|
| 730 | 791 | /// Copy constructor. |
| 731 | 792 | /// |
| 732 | 793 | InArcIt(const InArcIt& e) : Arc(e) { } |
| | 794 | /// Assignment operator |
| | 795 | |
| | 796 | /// Assignment operator. |
| | 797 | /// |
| | 798 | const InArcIt &operator=(const InArcIt&) { return *this; } |
| 733 | 799 | /// %Invalid constructor \& conversion. |
| 734 | 800 | |
| 735 | 801 | /// Initializes the iterator to be invalid. |
diff --git a/lemon/concepts/digraph.h b/lemon/concepts/digraph.h
|
a
|
b
|
|
| 77 | 77 | /// |
| 78 | 78 | Node(const Node&) { } |
| 79 | 79 | |
| | 80 | /// Assignment operator |
| | 81 | |
| | 82 | /// Assignment operator. |
| | 83 | /// |
| | 84 | const Node &operator=(const Node&) { return *this; } |
| | 85 | |
| 80 | 86 | /// %Invalid constructor \& conversion. |
| 81 | 87 | |
| 82 | 88 | /// Initializes the object to be invalid. |
| … |
… |
|
| 126 | 132 | /// Copy constructor. |
| 127 | 133 | /// |
| 128 | 134 | NodeIt(const NodeIt& n) : Node(n) { } |
| | 135 | /// Assignment operator |
| | 136 | |
| | 137 | /// Assignment operator. |
| | 138 | /// |
| | 139 | const NodeIt &operator=(const NodeIt&) { return *this; } |
| | 140 | |
| 129 | 141 | /// %Invalid constructor \& conversion. |
| 130 | 142 | |
| 131 | 143 | /// Initializes the iterator to be invalid. |
| … |
… |
|
| 185 | 197 | /// Copy constructor. |
| 186 | 198 | /// |
| 187 | 199 | Arc(const Arc&) { } |
| | 200 | /// Assignment operator |
| | 201 | |
| | 202 | /// Assignment operator. |
| | 203 | /// |
| | 204 | const Arc &operator=(const Arc&) { return *this; } |
| | 205 | |
| 188 | 206 | /// %Invalid constructor \& conversion. |
| 189 | 207 | |
| 190 | 208 | /// Initializes the object to be invalid. |
| … |
… |
|
| 235 | 253 | /// Copy constructor. |
| 236 | 254 | /// |
| 237 | 255 | OutArcIt(const OutArcIt& e) : Arc(e) { } |
| | 256 | /// Assignment operator |
| | 257 | |
| | 258 | /// Assignment operator. |
| | 259 | /// |
| | 260 | const OutArcIt &operator=(const OutArcIt&) { return *this; } |
| 238 | 261 | /// %Invalid constructor \& conversion. |
| 239 | 262 | |
| 240 | 263 | /// Initializes the iterator to be invalid. |
| … |
… |
|
| 301 | 324 | /// Copy constructor. |
| 302 | 325 | /// |
| 303 | 326 | InArcIt(const InArcIt& e) : Arc(e) { } |
| | 327 | /// Assignment operator |
| | 328 | |
| | 329 | /// Assignment operator. |
| | 330 | /// |
| | 331 | const InArcIt &operator=(const InArcIt&) { return *this; } |
| | 332 | |
| 304 | 333 | /// %Invalid constructor \& conversion. |
| 305 | 334 | |
| 306 | 335 | /// Initializes the iterator to be invalid. |
| … |
… |
|
| 365 | 394 | /// Copy constructor. |
| 366 | 395 | /// |
| 367 | 396 | ArcIt(const ArcIt& e) : Arc(e) { } |
| | 397 | /// Assignment operator |
| | 398 | |
| | 399 | /// Assignment operator. |
| | 400 | /// |
| | 401 | const ArcIt &operator=(const ArcIt&) { return *this; } |
| | 402 | |
| 368 | 403 | /// %Invalid constructor \& conversion. |
| 369 | 404 | |
| 370 | 405 | /// Initializes the iterator to be invalid. |
| … |
… |
|
| 521 | 556 | ///Copy constructor |
| 522 | 557 | NodeMap(const NodeMap& nm) : |
| 523 | 558 | ReferenceMap<Node, T, T&, const T&>(nm) { } |
| | 559 | public: |
| 524 | 560 | ///Assignment operator |
| | 561 | NodeMap& operator=(const NodeMap&) { |
| | 562 | return *this; |
| | 563 | } |
| | 564 | ///Template Assignment operator |
| 525 | 565 | template <typename CMap> |
| 526 | 566 | NodeMap& operator=(const CMap&) { |
| 527 | 567 | checkConcept<ReadMap<Node, T>, CMap>(); |
diff --git a/lemon/concepts/graph.h b/lemon/concepts/graph.h
|
a
|
b
|
|
| 108 | 108 | /// Copy constructor. |
| 109 | 109 | /// |
| 110 | 110 | Node(const Node&) { } |
| | 111 | /// Assignment operator |
| | 112 | |
| | 113 | /// Assignment operator. |
| | 114 | /// |
| | 115 | const Node &operator=(const Node&) { return *this; } |
| 111 | 116 | |
| 112 | 117 | /// %Invalid constructor \& conversion. |
| 113 | 118 | |
| … |
… |
|
| 159 | 164 | /// Copy constructor. |
| 160 | 165 | /// |
| 161 | 166 | NodeIt(const NodeIt& n) : Node(n) { } |
| | 167 | /// Assignment operator |
| | 168 | |
| | 169 | /// Assignment operator. |
| | 170 | /// |
| | 171 | const NodeIt &operator=(const NodeIt&) { return *this; } |
| | 172 | |
| 162 | 173 | /// %Invalid constructor \& conversion. |
| 163 | 174 | |
| 164 | 175 | /// Initializes the iterator to be invalid. |
| … |
… |
|
| 218 | 229 | /// Copy constructor. |
| 219 | 230 | /// |
| 220 | 231 | Edge(const Edge&) { } |
| | 232 | /// Assignment operator |
| | 233 | |
| | 234 | /// Assignment operator. |
| | 235 | /// |
| | 236 | const Edge &operator=(const Edge&) { return *this; } |
| | 237 | |
| 221 | 238 | /// %Invalid constructor \& conversion. |
| 222 | 239 | |
| 223 | 240 | /// Initializes the object to be invalid. |
| … |
… |
|
| 266 | 283 | /// Copy constructor. |
| 267 | 284 | /// |
| 268 | 285 | EdgeIt(const EdgeIt& e) : Edge(e) { } |
| | 286 | /// Assignment operator |
| | 287 | |
| | 288 | /// Assignment operator. |
| | 289 | /// |
| | 290 | const EdgeIt &operator=(const EdgeIt&) { return *this; } |
| | 291 | |
| 269 | 292 | /// %Invalid constructor \& conversion. |
| 270 | 293 | |
| 271 | 294 | /// Initializes the iterator to be invalid. |
| … |
… |
|
| 335 | 358 | /// Copy constructor. |
| 336 | 359 | /// |
| 337 | 360 | IncEdgeIt(const IncEdgeIt& e) : Edge(e) { } |
| | 361 | /// Assignment operator |
| | 362 | |
| | 363 | /// Assignment operator. |
| | 364 | /// |
| | 365 | const IncEdgeIt &operator=(const IncEdgeIt&) { return *this; } |
| | 366 | |
| 338 | 367 | /// %Invalid constructor \& conversion. |
| 339 | 368 | |
| 340 | 369 | /// Initializes the iterator to be invalid. |
| … |
… |
|
| 396 | 425 | /// Copy constructor. |
| 397 | 426 | /// |
| 398 | 427 | Arc(const Arc&) { } |
| | 428 | /// Assignment operator |
| | 429 | |
| | 430 | /// Assignment operator. |
| | 431 | /// |
| | 432 | const Arc &operator=(const Arc&) { return *this; } |
| | 433 | |
| 399 | 434 | /// %Invalid constructor \& conversion. |
| 400 | 435 | |
| 401 | 436 | /// Initializes the object to be invalid. |
| … |
… |
|
| 450 | 485 | /// Copy constructor. |
| 451 | 486 | /// |
| 452 | 487 | ArcIt(const ArcIt& e) : Arc(e) { } |
| | 488 | /// Assignment operator |
| | 489 | |
| | 490 | /// Assignment operator. |
| | 491 | /// |
| | 492 | const ArcIt &operator=(const ArcIt&) { return *this; } |
| | 493 | |
| 453 | 494 | /// %Invalid constructor \& conversion. |
| 454 | 495 | |
| 455 | 496 | /// Initializes the iterator to be invalid. |
| … |
… |
|
| 518 | 559 | /// Copy constructor. |
| 519 | 560 | /// |
| 520 | 561 | OutArcIt(const OutArcIt& e) : Arc(e) { } |
| | 562 | /// Assignment operator |
| | 563 | |
| | 564 | /// Assignment operator. |
| | 565 | /// |
| | 566 | const OutArcIt &operator=(const OutArcIt&) { return *this; } |
| | 567 | |
| 521 | 568 | /// %Invalid constructor \& conversion. |
| 522 | 569 | |
| 523 | 570 | /// Initializes the iterator to be invalid. |
| … |
… |
|
| 587 | 634 | /// Copy constructor. |
| 588 | 635 | /// |
| 589 | 636 | InArcIt(const InArcIt& e) : Arc(e) { } |
| | 637 | /// Assignment operator |
| | 638 | |
| | 639 | /// Assignment operator. |
| | 640 | /// |
| | 641 | const InArcIt &operator=(const InArcIt&) { return *this; } |
| | 642 | |
| 590 | 643 | /// %Invalid constructor \& conversion. |
| 591 | 644 | |
| 592 | 645 | /// Initializes the iterator to be invalid. |
diff --git a/lemon/concepts/graph_components.h b/lemon/concepts/graph_components.h
|
a
|
b
|
|
| 219 | 219 | /// Copy constructor. |
| 220 | 220 | Edge(const Edge &) : Parent() {} |
| 221 | 221 | |
| | 222 | /// Assignment operator |
| | 223 | |
| | 224 | /// Assignment operator. |
| | 225 | /// |
| | 226 | const Edge &operator=(const Edge&) { return *this; } |
| | 227 | |
| 222 | 228 | /// \brief Constructor for conversion from \c INVALID. |
| 223 | 229 | /// |
| 224 | 230 | /// Constructor for conversion from \c INVALID. |
| … |
… |
|
| 336 | 342 | /// |
| 337 | 343 | /// Copy constructor. |
| 338 | 344 | RedNode(const RedNode &) : Parent() {} |
| | 345 | /// Assignment operator |
| | 346 | |
| | 347 | /// Assignment operator. |
| | 348 | /// |
| | 349 | const RedNode &operator=(const RedNode&) { return *this; } |
| 339 | 350 | |
| 340 | 351 | /// \brief Constructor for conversion from \c INVALID. |
| 341 | 352 | /// |
| … |
… |
|
| 365 | 376 | /// |
| 366 | 377 | /// Copy constructor. |
| 367 | 378 | BlueNode(const BlueNode &) : Parent() {} |
| | 379 | /// Assignment operator |
| | 380 | |
| | 381 | /// Assignment operator. |
| | 382 | /// |
| | 383 | const BlueNode &operator=(const BlueNode&) { return *this; } |
| | 384 | |
| 368 | 385 | |
| 369 | 386 | /// \brief Constructor for conversion from \c INVALID. |
| 370 | 387 | /// |
diff --git a/lemon/list_graph.h b/lemon/list_graph.h
|
a
|
b
|
|
| 1657 | 1657 | RedNode() {} |
| 1658 | 1658 | RedNode(const RedNode& node) : Node(node) {} |
| 1659 | 1659 | RedNode(Invalid) : Node(INVALID){} |
| | 1660 | const RedNode& operator=(const RedNode& node) { Node::operator=(node); return *this;} |
| 1660 | 1661 | }; |
| 1661 | 1662 | |
| 1662 | 1663 | class BlueNode : public Node { |
| … |
… |
|
| 1669 | 1670 | BlueNode() {} |
| 1670 | 1671 | BlueNode(const BlueNode& node) : Node(node) {} |
| 1671 | 1672 | BlueNode(Invalid) : Node(INVALID){} |
| | 1673 | const BlueNode& operator=(const BlueNode& node) { Node::operator=(node); return *this;} |
| 1672 | 1674 | }; |
| 1673 | 1675 | |
| 1674 | 1676 | class Edge { |
diff --git a/lemon/maps.h b/lemon/maps.h
|
a
|
b
|
|
| 294 | 294 | |
| 295 | 295 | private: |
| 296 | 296 | |
| 297 | | RangeMap& operator=(const RangeMap&); |
| | 297 | // RangeMap& operator=(const RangeMap&); |
| 298 | 298 | |
| 299 | 299 | public: |
| 300 | 300 | |
| | 301 | // ///\e |
| | 302 | // RangeMap(const RangeMap&); |
| | 303 | |
| 301 | 304 | ///\e |
| 302 | 305 | Reference operator[](const Key &k) { |
| 303 | 306 | return _vector[k]; |
diff --git a/lemon/smart_graph.h b/lemon/smart_graph.h
|
a
|
b
|
|
| 863 | 863 | public: |
| 864 | 864 | RedNode() {} |
| 865 | 865 | RedNode(const RedNode& node) : Node(node) {} |
| 866 | | RedNode(Invalid) : Node(INVALID){} |
| | 866 | RedNode(Invalid) : Node(INVALID) {} |
| | 867 | const RedNode& operator=(const RedNode& node) { Node::operator=(node); return *this;} |
| 867 | 868 | }; |
| 868 | 869 | |
| 869 | 870 | class BlueNode : public Node { |
| … |
… |
|
| 876 | 877 | BlueNode() {} |
| 877 | 878 | BlueNode(const BlueNode& node) : Node(node) {} |
| 878 | 879 | BlueNode(Invalid) : Node(INVALID){} |
| | 880 | const BlueNode& operator=(const BlueNode& node) { Node::operator=(node); return *this;} |
| 879 | 881 | }; |
| 880 | 882 | |
| 881 | 883 | class Edge { |
diff --git a/test/maps_test.cc b/test/maps_test.cc
|
a
|
b
|
|
| 61 | 61 | typedef A argument_type; |
| 62 | 62 | typedef B result_type; |
| 63 | 63 | |
| | 64 | F() {}; |
| | 65 | F(const F&) {}; |
| | 66 | |
| 64 | 67 | B operator()(const A&) const { return B(); } |
| 65 | 68 | private: |
| 66 | 69 | F& operator=(const F&); |