diff options
author | Mikhail Gorbushin <m.gorbushin@corp.mail.ru> | 2018-08-31 11:35:44 +0300 |
---|---|---|
committer | Vlad Mihaylenko <vxmihaylenko@gmail.com> | 2018-08-31 15:34:54 +0300 |
commit | 7b1b6d68940678abe4b182e7eaab425f8e8f5bfa (patch) | |
tree | 1a60cef3101193a11f346727ead8f8dd1a58199d /search | |
parent | e73f3c434b1040685c365383baebab93411205bb (diff) |
remove my::make_unique
Diffstat (limited to 'search')
-rw-r--r-- | search/feature_loader.cpp | 4 | ||||
-rw-r--r-- | search/geocoder.cpp | 5 | ||||
-rw-r--r-- | search/pysearch/bindings.cpp | 3 | ||||
-rw-r--r-- | search/search_quality/assessment_tool/result_view.cpp | 5 | ||||
-rw-r--r-- | search/search_tests_support/test_with_custom_mwms.hpp | 4 |
5 files changed, 10 insertions, 11 deletions
diff --git a/search/feature_loader.cpp b/search/feature_loader.cpp index 6147cb4c72..f8bef30368 100644 --- a/search/feature_loader.cpp +++ b/search/feature_loader.cpp @@ -4,7 +4,7 @@ #include "indexer/feature_decl.hpp" -#include "base/stl_add.hpp" +#include <memory> namespace search { @@ -16,7 +16,7 @@ bool FeatureLoader::Load(FeatureID const & id, FeatureType & ft) auto const & mwmId = id.m_mwmId; if (!m_guard || m_guard->GetId() != mwmId) - m_guard = my::make_unique<FeaturesLoaderGuard>(m_dataSource, mwmId); + m_guard = std::make_unique<FeaturesLoaderGuard>(m_dataSource, mwmId); return m_guard->GetFeatureByIndex(id.m_index, ft); } diff --git a/search/geocoder.cpp b/search/geocoder.cpp index 5e1133b8dc..78fc247e36 100644 --- a/search/geocoder.cpp +++ b/search/geocoder.cpp @@ -38,7 +38,6 @@ #include "base/pprof.hpp" #include "base/random.hpp" #include "base/scope_guard.hpp" -#include "base/stl_add.hpp" #include "base/stl_helpers.hpp" #include "std/algorithm.hpp" @@ -55,6 +54,8 @@ #include "base/timer.hpp" #endif +#include <memory> + using namespace strings; namespace search @@ -515,7 +516,7 @@ void Geocoder::GoImpl(vector<shared_ptr<MwmInfo>> & infos, bool inViewport) { it = m_matchersCache .insert(make_pair(m_context->GetId(), - my::make_unique<FeaturesLayerMatcher>(m_dataSource, m_cancellable))) + std::make_unique<FeaturesLayerMatcher>(m_dataSource, m_cancellable))) .first; } m_matcher = it->second.get(); diff --git a/search/pysearch/bindings.cpp b/search/pysearch/bindings.cpp index 74d9d0477a..e61f90808c 100644 --- a/search/pysearch/bindings.cpp +++ b/search/pysearch/bindings.cpp @@ -19,7 +19,6 @@ #include "geometry/rect2d.hpp" #include "base/assert.hpp" -#include "base/stl_add.hpp" #include <boost/python.hpp> @@ -75,7 +74,7 @@ void Init(string const & resource_path, string const & mwm_path) classificator::Load(); - g_affiliations = my::make_unique<storage::TMappingAffiliations>(); + g_affiliations = make_unique<storage::TMappingAffiliations>(); storage::TCountryTree countries; auto const rv = storage::LoadCountriesFromFile(countriesFile, countries, *g_affiliations); CHECK(rv != -1, ("Can't load countries from:", countriesFile)); diff --git a/search/search_quality/assessment_tool/result_view.cpp b/search/search_quality/assessment_tool/result_view.cpp index bef6d3ad5f..e4dcd125cb 100644 --- a/search/search_quality/assessment_tool/result_view.cpp +++ b/search/search_quality/assessment_tool/result_view.cpp @@ -3,8 +3,7 @@ #include "search/result.hpp" #include "search/search_quality/assessment_tool/helpers.hpp" -#include "base/stl_add.hpp" - +#include <memory> #include <utility> #include <vector> @@ -65,7 +64,7 @@ ResultView::ResultView(search::Sample::Result const & result, QWidget & parent) void ResultView::SetEditor(Edits::Editor && editor) { - m_editor = my::make_unique<Edits::Editor>(std::move(editor)); + m_editor = make_unique<Edits::Editor>(std::move(editor)); UpdateRelevanceRadioButtons(); diff --git a/search/search_tests_support/test_with_custom_mwms.hpp b/search/search_tests_support/test_with_custom_mwms.hpp index c44554e433..eeb2f1c698 100644 --- a/search/search_tests_support/test_with_custom_mwms.hpp +++ b/search/search_tests_support/test_with_custom_mwms.hpp @@ -10,8 +10,8 @@ #include "indexer/feature.hpp" #include "base/assert.hpp" -#include "base/stl_add.hpp" +#include <memory> #include <utility> namespace search @@ -23,7 +23,7 @@ class TestWithCustomMwms : public generator::tests_support::TestWithCustomMwms public: TestWithCustomMwms() { - editor::tests_support::SetUpEditorForTesting(my::make_unique<EditorDelegate>(m_dataSource)); + editor::tests_support::SetUpEditorForTesting(std::make_unique<EditorDelegate>(m_dataSource)); } ~TestWithCustomMwms() override { editor::tests_support::TearDownEditorForTesting(); } |