From c19695ab953c979f15bbc72c4f4a453e9a114cf6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?M=C3=A5rten=20Nordheim?= Date: Thu, 26 Nov 2020 12:27:24 +0100 Subject: [PATCH] QDuplicateTracker: remove the appendTo && overload As a requirement for unordered_set (and QSet) both "iterator" and "const_iterator" are const, so we cannot reassign or move the key. That means this overload is no different to the const & overload, so we can just remove it. Pick-to: 6.0 Change-Id: Ia14dccf7f610967649bab38161ce6d963509316b Reviewed-by: Giuseppe D'Angelo --- src/corelib/tools/qduplicatetracker_p.h | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/src/corelib/tools/qduplicatetracker_p.h b/src/corelib/tools/qduplicatetracker_p.h index e5bb11793ad..817d259d239 100644 --- a/src/corelib/tools/qduplicatetracker_p.h +++ b/src/corelib/tools/qduplicatetracker_p.h @@ -101,18 +101,11 @@ public: } template - void appendTo(C &c) const & + void appendTo(C &c) const { for (const auto &e : set) c.push_back(e); } - - template - void appendTo(C &c) && - { - for (auto &e : set) - c.push_back(std::move(e)); - } }; QT_END_NAMESPACE