mirror/OpenMW
1
0
Fork 0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-01-04 02:41:19 +00:00
Code Issues Projects 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);
for (auto& [k, v] : *it)
{
auto it = variables.find(k);
if (it == variables.end())
auto variable = variables.find(k);
if (variable == variables.end())
variables.insert({k, v});
else if (it->second.defaulted())
it->second = v;
else if (variable->second.defaulted())
variable->second = v;
}
mergeComposingVariables(variables, composingVariables, description);
}