Disable warning about self-move and self-assign-overload

Change-Id: I1d20d3f424eced5cc5787934663b9d243f75d46e
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
bb10
Tor Arne Vestbø 2020-07-26 17:11:19 +02:00
parent d1fd2ff11f
commit f418a96f9b
7 changed files with 28 additions and 0 deletions

View File

@ -147,6 +147,9 @@ void tst_QRandomGenerator::basics()
// default constructible
QRandomGenerator rng;
QT_WARNING_PUSH
QT_WARNING_DISABLE_CLANG("-Wself-move")
QT_WARNING_DISABLE_CLANG("-Wself-assign-overloaded")
// copyable && movable
rng = rng;
rng = std::move(rng);
@ -155,6 +158,7 @@ void tst_QRandomGenerator::basics()
QRandomGenerator64 rng64;
rng64 = rng64;
rng64 = std::move(rng64);
QT_WARNING_POP
// 32- and 64-bit should be interchangeable:
rng = rng64;

View File

@ -1653,7 +1653,10 @@ void tst_QDir::dirName()
void tst_QDir::operator_eq()
{
QDir dir1(".");
QT_WARNING_PUSH
QT_WARNING_DISABLE_CLANG("-Wself-assign-overloaded")
dir1 = dir1;
QT_WARNING_POP
dir1.setPath("..");
}

View File

@ -468,9 +468,12 @@ void tst_QCborValue::copyCompare()
QFETCH(QCborValue, v);
QCborValue other = v;
QT_WARNING_PUSH
QT_WARNING_DISABLE_CLANG("-Wself-move")
// self-moving
v = std::move(v);
QCOMPARE(v, other); // make sure it's still valid
QT_WARNING_POP
// moving
v = std::move(other);

View File

@ -840,9 +840,12 @@ void tst_QAtomicInt::operators()
QCOMPARE(int(atomic), x);
QCOMPARE(int(atomic), 0x13);
QT_WARNING_PUSH
QT_WARNING_DISABLE_CLANG("-Wself-assign-overloaded")
x = (atomic ^= atomic);
QCOMPARE(int(atomic), x);
QCOMPARE(int(atomic), 0);
QT_WARNING_POP
}
void tst_QAtomicInt::testAndSet_loop()

View File

@ -455,7 +455,10 @@ void tst_Collections::list()
{
QList<int> list;
list.append(1);
QT_WARNING_PUSH
QT_WARNING_DISABLE_CLANG("-Wself-assign-overloaded")
list = list;
QT_WARNING_POP
QVERIFY(list.size() == 1);
}
}
@ -1143,6 +1146,8 @@ void tst_Collections::hash()
QVERIFY(hash.size() == 2);
QVERIFY(!hash.isEmpty());
QT_WARNING_PUSH
QT_WARNING_DISABLE_CLANG("-Wself-assign-overloaded")
{
Hash hash2 = hash;
hash2 = hash;
@ -1155,6 +1160,7 @@ void tst_Collections::hash()
QVERIFY(hash2.isEmpty());
}
QVERIFY(hash.size() == 2);
QT_WARNING_POP
{
Hash hash2 = hash;
@ -1366,6 +1372,8 @@ void tst_Collections::map()
QVERIFY(map.size() == 2);
QVERIFY(!map.isEmpty());
QT_WARNING_PUSH
QT_WARNING_DISABLE_CLANG("-Wself-assign-overloaded")
{
Map map2 = map;
map2 = map;
@ -1378,6 +1386,7 @@ void tst_Collections::map()
QVERIFY(map2.isEmpty());
}
QVERIFY(map.size() == 2);
QT_WARNING_POP
{
Map map2 = map;

View File

@ -331,6 +331,8 @@ void tst_QHash::insert1()
QVERIFY(hash.size() == 2);
QVERIFY(!hash.isEmpty());
QT_WARNING_PUSH
QT_WARNING_DISABLE_CLANG("-Wself-assign-overloaded")
{
Hash hash2 = hash;
hash2 = hash;
@ -343,6 +345,7 @@ void tst_QHash::insert1()
QVERIFY(hash2.isEmpty());
}
QVERIFY(hash.size() == 2);
QT_WARNING_POP
{
Hash hash2 = hash;

View File

@ -1224,8 +1224,11 @@ void tst_Compiler::cxx11_rvalue_refs()
#else
// we require std::move:
{
QT_WARNING_PUSH
QT_WARNING_DISABLE_CLANG("-Wself-move")
int i = 1;
i = std::move(i);
QT_WARNING_POP
MoveDefinedQString s("Hello");
MoveDefinedQString t = std::move(s);