From 344802b8b2458ba463a5cc6e01f787ea46795025 Mon Sep 17 00:00:00 2001 From: Eike Ziller Date: Wed, 9 Dec 2020 12:25:57 +0100 Subject: [PATCH] Don't call erase without namespace qualification C++20 adds free a function `erase` as API for containers, and Qt 6.1 adds it for Qt containers. Since it is a free function, ADL kicks in and creates issues if we don't fully qualify calls to our `erase` function. Change-Id: Ie5971d9206ae9e87e0f28f1390c09ded6f431b90 Reviewed-by: hjk --- src/plugins/projectexplorer/projectexplorer.cpp | 2 +- src/plugins/remotelinux/rsyncdeploystep.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/plugins/projectexplorer/projectexplorer.cpp b/src/plugins/projectexplorer/projectexplorer.cpp index ca70a250b88..16970638495 100644 --- a/src/plugins/projectexplorer/projectexplorer.cpp +++ b/src/plugins/projectexplorer/projectexplorer.cpp @@ -3902,7 +3902,7 @@ void ProjectExplorerPlugin::addCustomParser(const CustomParserSettings &settings void ProjectExplorerPlugin::removeCustomParser(Id id) { - erase(dd->m_customParsers, [id](const CustomParserSettings &s) { + Utils::erase(dd->m_customParsers, [id](const CustomParserSettings &s) { return s.id == id; }); emit m_instance->customParsersChanged(); diff --git a/src/plugins/remotelinux/rsyncdeploystep.cpp b/src/plugins/remotelinux/rsyncdeploystep.cpp index 0ac1a9b9b01..76efc5b03ed 100644 --- a/src/plugins/remotelinux/rsyncdeploystep.cpp +++ b/src/plugins/remotelinux/rsyncdeploystep.cpp @@ -90,7 +90,7 @@ void RsyncDeployService::doDeploy() void RsyncDeployService::filterDeployableFiles() const { if (m_ignoreMissingFiles) { - erase(m_deployableFiles, [](const DeployableFile &f) { + Utils::erase(m_deployableFiles, [](const DeployableFile &f) { return !f.localFilePath().exists(); }); }