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

Fix warning: "Mixing iterators with const_iterators"

Browse Source 
[-Wclazy-strict-iterators]

Change-Id: Ibc7e07a0f8390297589656c3c2ddfdd4c0151887
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
This commit is contained in:
Alessandro Portale
2019-01-16 12:40:15 +01:00
parent a929ffd066
commit 7f641d3c08
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/libs/cplusplus/pp-engine.cpp
View File

@@ -1127,7 +1127,7 @@ bool Preprocessor::handleIdentifier(PPToken *tk)
} }
} }
m_state.pushTokenBuffer(body.begin(), body.end(), macro); m_state.pushTokenBuffer(body.constBegin(), body.constEnd(), macro);
if (m_client && !idTk.generated()) if (m_client && !idTk.generated())
m_client->stopExpandingMacro(idTk.byteOffset, *macro); m_client->stopExpandingMacro(idTk.byteOffset, *macro);

2
src/plugins/modeleditor/componentviewcontroller.cpp
View File

@@ -248,7 +248,7 @@ void UpdateIncludeDependenciesVisitor::collectElementPaths(const ProjectExplorer
qmt::MComponent *UpdateIncludeDependenciesVisitor::findComponentFromFilePath(const QString &filePath) qmt::MComponent *UpdateIncludeDependenciesVisitor::findComponentFromFilePath(const QString &filePath)
{ {
const auto it = m_filePathComponentsMap.find(filePath); const auto it = m_filePathComponentsMap.constFind(filePath);
if (it != m_filePathComponentsMap.cend()) if (it != m_filePathComponentsMap.cend())
return it.value(); return it.value();