diff options
Diffstat (limited to 'search/geometry_cache.hpp')
| -rw-r--r-- | search/geometry_cache.hpp | 23 |
1 files changed, 11 insertions, 12 deletions
diff --git a/search/geometry_cache.hpp b/search/geometry_cache.hpp index 2455930c02..b19a8efa95 100644 --- a/search/geometry_cache.hpp +++ b/search/geometry_cache.hpp @@ -8,12 +8,12 @@ #include "base/assert.hpp" -#include "std/algorithm.hpp" -#include "std/cstdint.hpp" -#include "std/deque.hpp" -#include "std/map.hpp" -#include "std/unique_ptr.hpp" -#include "std/utility.hpp" +#include <algorithm> +#include <cstdint> +#include <deque> +#include <map> +#include <memory> +#include <utility> namespace base { @@ -52,15 +52,15 @@ protected: GeometryCache(size_t maxNumEntries, base::Cancellable const & cancellable); template <typename TPred> - pair<Entry &, bool> FindOrCreateEntry(MwmSet::MwmId const & id, TPred && pred) + std::pair<Entry &, bool> FindOrCreateEntry(MwmSet::MwmId const & id, TPred && pred) { auto & entries = m_entries[id]; - auto it = find_if(entries.begin(), entries.end(), forward<TPred>(pred)); + auto it = find_if(entries.begin(), entries.end(), std::forward<TPred>(pred)); if (it != entries.end()) { if (it != entries.begin()) iter_swap(entries.begin(), it); - return pair<Entry &, bool>(entries.front(), false); + return std::pair<Entry &, bool>(entries.front(), false); } entries.emplace_front(); @@ -69,12 +69,12 @@ protected: ASSERT_LESS_OR_EQUAL(entries.size(), m_maxNumEntries, ()); ASSERT(!entries.empty(), ()); - return pair<Entry &, bool>(entries.front(), true); + return std::pair<Entry &, bool>(entries.front(), true); } void InitEntry(MwmContext const & context, m2::RectD const & rect, int scale, Entry & entry); - map<MwmSet::MwmId, deque<Entry>> m_entries; + std::map<MwmSet::MwmId, std::deque<Entry>> m_entries; size_t const m_maxNumEntries; base::Cancellable const & m_cancellable; }; @@ -100,5 +100,4 @@ public: // GeometryCache overrides: CBV Get(MwmContext const & context, m2::RectD const & rect, int scale) override; }; - } // namespace search |