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 /android
parente73f3c434b1040685c365383baebab93411205bb (diff)
remove my::make_unique
Diffstat (limited to 'android')
-rw-r--r--android/jni/com/mapswithme/platform/Platform.cpp4
-rw-r--r--android/jni/com/mapswithme/platform/SocketImpl.cpp5
2 files changed, 5 insertions, 4 deletions
diff --git a/android/jni/com/mapswithme/platform/Platform.cpp b/android/jni/com/mapswithme/platform/Platform.cpp
index 9e7834423a..07798a8098 100644
--- a/android/jni/com/mapswithme/platform/Platform.cpp
+++ b/android/jni/com/mapswithme/platform/Platform.cpp
@@ -10,10 +10,10 @@
#include "base/logging.hpp"
#include "base/macros.hpp"
-#include "base/stl_add.hpp"
#include "base/string_utils.hpp"
#include <algorithm>
+#include <memory>
#include <utility>
#include <sys/system_properties.h>
@@ -155,7 +155,7 @@ void Platform::Initialize(JNIEnv * env, jobject functorProcessObject, jstring ap
m_myTrackerTrackMethod = env->GetStaticMethodID(g_myTrackerClazz, "trackEvent",
"(Ljava/lang/String;)Z");
- m_guiThread = my::make_unique<GuiThread>(m_functorProcessObject);
+ m_guiThread = std::make_unique<GuiThread>(m_functorProcessObject);
std::string const flavor = jni::ToNativeString(env, flavorName);
std::string const build = jni::ToNativeString(env, buildType);
diff --git a/android/jni/com/mapswithme/platform/SocketImpl.cpp b/android/jni/com/mapswithme/platform/SocketImpl.cpp
index 55aaf7fd38..4fd440144b 100644
--- a/android/jni/com/mapswithme/platform/SocketImpl.cpp
+++ b/android/jni/com/mapswithme/platform/SocketImpl.cpp
@@ -3,7 +3,8 @@
#include "platform/socket.hpp"
#include "base/logging.hpp"
-#include "base/stl_add.hpp"
+
+#include <memory>
namespace platform
{
@@ -86,5 +87,5 @@ private:
jobject m_self;
};
-std::unique_ptr<Socket> CreateSocket() { return my::make_unique<SocketImpl>(); }
+std::unique_ptr<Socket> CreateSocket() { return std::make_unique<SocketImpl>(); }
}