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

Don't call erase without namespace qualification

Browse Source 
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 <hjk@qt.io>
This commit is contained in:
Eike Ziller
2020-12-09 12:25:57 +01:00
parent 36c2e441ef
commit 344802b8b2
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/projectexplorer/projectexplorer.cpp
View File

@@ -3902,7 +3902,7 @@ void ProjectExplorerPlugin::addCustomParser(const CustomParserSettings &settings
void ProjectExplorerPlugin::removeCustomParser(Id id) 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; return s.id == id;
}); });
emit m_instance->customParsersChanged(); emit m_instance->customParsersChanged();

2
src/plugins/remotelinux/rsyncdeploystep.cpp
View File

@@ -90,7 +90,7 @@ void RsyncDeployService::doDeploy()
void RsyncDeployService::filterDeployableFiles() const void RsyncDeployService::filterDeployableFiles() const
{ {
if (m_ignoreMissingFiles) { if (m_ignoreMissingFiles) {
erase(m_deployableFiles, [](const DeployableFile &f) { Utils::erase(m_deployableFiles, [](const DeployableFile &f) {
return !f.localFilePath().exists(); return !f.localFilePath().exists();
}); });
} }