diff --git a/base/stl_helpers.hpp b/base/stl_helpers.hpp index 4ad67bed8a..9bd98c991e 100644 --- a/base/stl_helpers.hpp +++ b/base/stl_helpers.hpp @@ -159,7 +159,7 @@ impl::Equals EqualsBy(T (C::*p)() const) } template -constexpr std::underlying_type_t Key(T value) +std::underlying_type_t constexpr Key(T value) { return static_cast>(value); } diff --git a/routing/routing_quality/utils.cpp b/routing/routing_quality/utils.cpp index 0e113c1056..cbf9657350 100644 --- a/routing/routing_quality/utils.cpp +++ b/routing/routing_quality/utils.cpp @@ -53,7 +53,7 @@ public: return infoGetter.GetLimitRectForLeaf(countryId); }; - auto const index = my::Key(type); + auto const index = base::Key(type); if (!m_routers[index]) { m_routers[index] = make_unique(type, false /* load altitudes */, *m_cpg, @@ -95,7 +95,7 @@ private: FrozenDataSource m_dataSource; shared_ptr m_numMwmIds = make_shared(); - array, my::Key(VehicleType::Count)> m_routers{}; + array, base::Key(VehicleType::Count)> m_routers{}; unique_ptr m_cpg = make_unique(); unique_ptr m_cig = storage::CountryInfoReader::CreateCountryInfoReader(GetPlatform()); traffic::TrafficCache m_trafficCache;