RedAuburn/organicmaps
1
Fork 0
forked from organicmaps/organicmaps
Code Pull requests Activity

[routing] remove insert(make_pair...

Browse source
This commit is contained in:
Mikhail Gorbushin 2019-08-05 15:06:08 +03:00 • committed by Vladimir Byko-Ianko
parent 32ddd5efb9
commit e16f74102f
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
routing/features_road_graph.cpp
View file

@ -93,7 +93,7 @@ VehicleModelInterface * FeaturesRoadGraph::CrossCountryVehicleModel::GetVehicleM
ASSERT(vehicleModel, ());
ASSERT_EQUAL(m_maxSpeed, vehicleModel->GetMaxWeightSpeed(), ());
itr = m_cache.insert(make_pair(featureId.m_mwmId, move(vehicleModel))).first;
itr = m_cache.emplace(featureId.m_mwmId, move(vehicleModel)).first;
return itr->second.get();
}
@ -104,7 +104,7 @@ void FeaturesRoadGraph::CrossCountryVehicleModel::Clear()
IRoadGraph::RoadInfo & FeaturesRoadGraph::RoadInfoCache::Find(FeatureID const & featureId, bool & found)
{
auto res = m_cache.insert(make_pair(featureId.m_mwmId, TMwmFeatureCache()));
auto res = m_cache.emplace(featureId.m_mwmId, TMwmFeatureCache());
if (res.second)
res.first->second.Init(kPowOfTwoForFeatureCacheSize);
return res.first->second.Find(featureId.m_index, found);
@ -361,7 +361,7 @@ FeaturesRoadGraph::Value const & FeaturesRoadGraph::LockMwm(MwmSet::MwmId const
if (itr != m_mwmLocks.end())
return itr->second;
return m_mwmLocks.insert(make_pair(move(mwmId), Value(m_dataSource, m_dataSource.GetMwmHandleById(mwmId))))
return m_mwmLocks.emplace(move(mwmId), Value(m_dataSource, m_dataSource.GetMwmHandleById(mwmId)))
.first->second;
}
} // namespace routing