From e6cd1eb0791bde5d61e6c4aa2275bc7050e0c1d1 Mon Sep 17 00:00:00 2001
From: Marc Mutz <marc.mutz@qt.io>
Date: Fri, 7 Jan 2022 09:20:00 +0100
Subject: QFlatMap: fix mixed rvalue/lvalue insert overloads

They never worked.

Pick-to: 6.3 6.2
Change-Id: I9a15c848416419823f28ea580248fbe93a4365dd
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
---
 tests/auto/corelib/tools/qflatmap/tst_qflatmap.cpp | 37 ++++++++++++++++++++++
 1 file changed, 37 insertions(+)

(limited to 'tests/auto/corelib/tools')

diff --git a/tests/auto/corelib/tools/qflatmap/tst_qflatmap.cpp b/tests/auto/corelib/tools/qflatmap/tst_qflatmap.cpp
index 674d9fa6c0..f8f48d7bfb 100644
--- a/tests/auto/corelib/tools/qflatmap/tst_qflatmap.cpp
+++ b/tests/auto/corelib/tools/qflatmap/tst_qflatmap.cpp
@@ -45,6 +45,7 @@ private slots:
     void constructing();
     void constAccess();
     void insertion();
+    void insertRValuesAndLValues();
     void removal();
     void extraction();
     void iterators();
@@ -156,6 +157,42 @@ void tst_QFlatMap::insertion()
     QCOMPARE(m.value("gnampf").data(), "GNAMPF");
 }
 
+void tst_QFlatMap::insertRValuesAndLValues()
+{
+    using Map = QFlatMap<QByteArray, QByteArray>;
+    const QByteArray foo = QByteArrayLiteral("foo");
+    const QByteArray bar = QByteArrayLiteral("bar");
+
+    auto rvalue = [](const QByteArray &ba) { return ba; };
+#define lvalue(x) x
+
+    {
+        Map m;
+        QVERIFY( m.insert(lvalue(foo), lvalue(bar)).second);
+        QVERIFY(!m.insert(lvalue(foo), lvalue(bar)).second);
+    }
+
+    {
+        Map m;
+        QVERIFY( m.insert(lvalue(foo), rvalue(bar)).second);
+        QVERIFY(!m.insert(lvalue(foo), rvalue(bar)).second);
+    }
+
+    {
+        Map m;
+        QVERIFY( m.insert(rvalue(foo), lvalue(bar)).second);
+        QVERIFY(!m.insert(rvalue(foo), lvalue(bar)).second);
+    }
+
+    {
+        Map m;
+        QVERIFY( m.insert(rvalue(foo), rvalue(bar)).second);
+        QVERIFY(!m.insert(rvalue(foo), rvalue(bar)).second);
+    }
+
+#undef lvalue
+}
+
 void tst_QFlatMap::extraction()
 {
     using Map = QFlatMap<int, QByteArray>;
-- 
cgit v1.2.3