GCC fixes for MapProvider iterator

This commit is contained in:
Dan Paulat 2023-04-30 18:38:48 -05:00
parent 98ab8904be
commit 1c1864e45d
3 changed files with 24 additions and 20 deletions

View file

@ -329,16 +329,13 @@ void SettingsDialogImpl::SetupGeneralTab()
mapProvider_.SetMapFromValueFunction(
[](const std::string& text) -> std::string
{
auto it = std::find_if(
map::MapProviderIterator().begin(),
map::MapProviderIterator().end(),
[&text](map::MapProvider mapProvider)
{ return boost::iequals(text, GetMapProviderName(mapProvider)); });
if (it != map::MapProviderIterator().end())
for (map::MapProvider mapProvider : map::MapProviderIterator())
{
// Return map provider label
return GetMapProviderName(*it);
if (boost::iequals(text, map::GetMapProviderName(mapProvider)))
{
// Return map provider label
return GetMapProviderName(mapProvider);
}
}
// Map provider label not found, return unknown