mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-03-29 04:06:40 +00:00
Code Issues Releases Wiki Activity

Fix C4456 msvc warning

Browse source 
declaration of 'it' hides previous local declaration
This commit is contained in:
elsid 2022-07-01 14:27:19 +02:00
parent 8544aa481c
commit 5891d58f63
No known key found for this signature in database
GPG key ID: 4DE04C198CBA7625
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
components/files/configurationmanager.cpp
View file

@ -128,11 +128,11 @@ void ConfigurationManager::readConfiguration(bpo::variables_map& variables,
auto composingVariables = separateComposingVariables(variables, description); auto composingVariables = separateComposingVariables(variables, description);
for (auto& [k, v] : *it) for (auto& [k, v] : *it)
{ {
auto it = variables.find(k); auto variable = variables.find(k);
if (it == variables.end()) if (variable == variables.end())
variables.insert({k, v}); variables.insert({k, v});
else if (it->second.defaulted()) else if (variable->second.defaulted())
it->second = v; variable->second = v;
} }
mergeComposingVariables(variables, composingVariables, description); mergeComposingVariables(variables, composingVariables, description);
} }