feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Fix build issues with C++20

Browse Source 
- "ISO C++20 considers use of overloaded operator!= to be ambiguous
despite there being a unique best viable function with non-reversed
arguments"

- std::erase(std::vector, ...) takes preference over Utils::erase if not
fully qualified

Fixes: QTCREATORBUG-25598
Change-Id: Ib9d0574ff46d2ab415437c0c044c51e8c9f37caa
Reviewed-by: Marco Bubke <marco.bubke@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
This commit is contained in:
Eike Ziller
2021-04-19 10:15:01 +02:00
parent f31d583081
commit c2e4f9f2a2
5 changed files with 21 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/plugins/debugger/peripheralregisterhandler.h
View File

@@ -82,8 +82,8 @@ class PeripheralRegisterValue final
{
public:
PeripheralRegisterValue(quint64 v = 0) : v(v) {}
bool operator==(const PeripheralRegisterValue &other) { return v == other.v; }
bool operator!=(const PeripheralRegisterValue &other) { return !operator==(other); }
bool operator==(const PeripheralRegisterValue &other) const { return v == other.v; }
bool operator!=(const PeripheralRegisterValue &other) const { return !operator==(other); }
bool fromString(const QString &string, PeripheralRegisterFormat fmt);
QString toString(int size, PeripheralRegisterFormat fmt) const;

9
src/plugins/projectexplorer/kitmanager.cpp
View File

@@ -238,10 +238,11 @@ void KitManager::restoreKits()
kitsToCheck.clear();
// Remove replacement kits for which the original kit has turned up again.
erase(resultList, [&resultList](const std::unique_ptr<Kit> &k) {
return k->isReplacementKit() && contains(resultList, [&k](const std::unique_ptr<Kit> &other) {
return other->id() == k->id() && other != k;
});
Utils::erase(resultList, [&resultList](const std::unique_ptr<Kit> &k) {
return k->isReplacementKit()
&& contains(resultList, [&k](const std::unique_ptr<Kit> &other) {
return other->id() == k->id() && other != k;
});
});
static const auto kitMatchesAbiList = [](const Kit *kit, const Abis &abis) {