Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/mapsme/omim.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMikhail Gorbushin <m.gorbushin@corp.mail.ru>2018-08-31 11:35:44 +0300
committerVlad Mihaylenko <vxmihaylenko@gmail.com>2018-08-31 15:34:54 +0300
commit7b1b6d68940678abe4b182e7eaab425f8e8f5bfa (patch)
tree1a60cef3101193a11f346727ead8f8dd1a58199d /drape_frontend
parente73f3c434b1040685c365383baebab93411205bb (diff)
remove my::make_unique
Diffstat (limited to 'drape_frontend')
-rwxr-xr-xdrape_frontend/frontend_renderer.cpp7
-rw-r--r--drape_frontend/scenario_manager.cpp4
2 files changed, 7 insertions, 4 deletions
diff --git a/drape_frontend/frontend_renderer.cpp b/drape_frontend/frontend_renderer.cpp
index 3f05daa6c3..7ff07c64a3 100755
--- a/drape_frontend/frontend_renderer.cpp
+++ b/drape_frontend/frontend_renderer.cpp
@@ -38,6 +38,7 @@
#include <chrono>
#include <cmath>
#include <functional>
+#include <memory>
#include <thread>
#include <utility>
@@ -516,9 +517,9 @@ void FrontendRenderer::AcceptMessage(ref_ptr<Message> message)
// receive FollowRoute message before FlushSubroute message, so we need to postpone its processing.
if (m_routeRenderer->GetSubroutes().empty())
{
- m_pendingFollowRoute = my::make_unique<FollowRouteData>(msg->GetPreferredZoomLevel(),
- msg->GetPreferredZoomLevelIn3d(),
- msg->EnableAutoZoom());
+ m_pendingFollowRoute = std::make_unique<FollowRouteData>(msg->GetPreferredZoomLevel(),
+ msg->GetPreferredZoomLevelIn3d(),
+ msg->EnableAutoZoom());
break;
}
diff --git a/drape_frontend/scenario_manager.cpp b/drape_frontend/scenario_manager.cpp
index 3f0fa52f35..8181a6d494 100644
--- a/drape_frontend/scenario_manager.cpp
+++ b/drape_frontend/scenario_manager.cpp
@@ -2,6 +2,8 @@
#include "drape_frontend/user_event_stream.hpp"
+#include <memory>
+
namespace df
{
@@ -43,7 +45,7 @@ bool ScenarioManager::RunScenario(ScenarioData && scenarioData, ScenarioCallback
std::swap(m_scenarioData, scenarioData);
m_onStartHandler = onStartFn;
m_onFinishHandler = onFinishFn;
- m_thread = my::make_unique<threads::SimpleThread>(&ScenarioManager::ThreadRoutine, this);
+ m_thread = std::make_unique<threads::SimpleThread>(&ScenarioManager::ThreadRoutine, this);
#ifdef DEBUG
m_threadId = m_thread->get_id();
#endif