remove my::make_unique

7 files changed, 18 insertions, 28 deletions

diff --git a/base/base_tests/buffer_vector_test.cpp b/base/base_tests/buffer_vector_test.cpp
index 56cb5a09cd..3b9e64e899 100644
--- a/base/base_tests/buffer_vector_test.cpp
+++ b/base/base_tests/buffer_vector_test.cpp
@@ -1,7 +1,6 @@
 #include "testing/testing.hpp"
 
 #include "base/buffer_vector.hpp"
-#include "base/stl_add.hpp"
 #include "base/string_utils.hpp"
 
 #include <memory>
@@ -358,7 +357,7 @@ UNIT_TEST(BufferVector_OnlyMoveableItems)
   buffer_vector<std::unique_ptr<size_t>, 4> v;
 
   for (size_t i = 0; i < 10; ++i)
-    v.emplace_back(my::make_unique<size_t>(i));
+    v.emplace_back(std::make_unique<size_t>(i));
 
   TEST_EQUAL(v.size(), 10, ());
   for (size_t i = 0; i < 10; ++i)
diff --git a/base/base_tests/condition_test.cpp b/base/base_tests/condition_test.cpp
index b1e1b65739..636d81878e 100644
--- a/base/base_tests/condition_test.cpp
+++ b/base/base_tests/condition_test.cpp
@@ -4,7 +4,8 @@
 #include "base/threaded_list.hpp"
 #include "base/condition.hpp"
 #include "base/logging.hpp"
-#include "base/stl_add.hpp"
+
+#include <memory>
 
 struct ConditionThread : public threads::IRoutine
 {
@@ -24,10 +25,10 @@ UNIT_TEST(Condition_Test)
   ThreadedList<int> l;
 
   threads::Thread t0;
-  t0.Create(my::make_unique<ConditionThread>(&l));
+  t0.Create(std::make_unique<ConditionThread>(&l));
 
   threads::Thread t1;
-  t1.Create(my::make_unique<ConditionThread>(&l));
+  t1.Create(std::make_unique<ConditionThread>(&l));
 
   l.Cancel();
   t0.Join();
diff --git a/base/base_tests/threaded_list_test.cpp b/base/base_tests/threaded_list_test.cpp
index c11fa80f2a..7608b6d428 100644
--- a/base/base_tests/threaded_list_test.cpp
+++ b/base/base_tests/threaded_list_test.cpp
@@ -3,8 +3,8 @@
 #include "base/threaded_list.hpp"
 #include "base/thread.hpp"
 #include "base/logging.hpp"
-#include "base/stl_add.hpp"
 
+#include <memory>
 #include <mutex>
 
 struct ThreadedListProcessor : public threads::IRoutine
@@ -45,13 +45,13 @@ UNIT_TEST(ThreadedList)
   ThreadedList<int> p;
 
   threads::Thread t0;
-  t0.Create(my::make_unique<ThreadedListProcessor>(p, resMutex, res, 0));
+  t0.Create(std::make_unique<ThreadedListProcessor>(p, resMutex, res, 0));
 
   threads::Thread t1;
-  t1.Create(my::make_unique<ThreadedListProcessor>(p, resMutex, res, 1));
+  t1.Create(std::make_unique<ThreadedListProcessor>(p, resMutex, res, 1));
 
   threads::Thread t2;
-  t2.Create(my::make_unique<ThreadedListProcessor>(p, resMutex, res, 2));
+  t2.Create(std::make_unique<ThreadedListProcessor>(p, resMutex, res, 2));
 
   p.PushBack(0);
   threads::Sleep(200);
diff --git a/base/base_tests/threads_test.cpp b/base/base_tests/threads_test.cpp
index 98933c7682..027711ce04 100644
--- a/base/base_tests/threads_test.cpp
+++ b/base/base_tests/threads_test.cpp
@@ -1,12 +1,11 @@
 #include "testing/testing.hpp"
 
 #include "base/thread.hpp"
-#include "base/stl_add.hpp"
 
 #include <vector>
+#include <memory>
 
-
-typedef std::vector<int> Vector;
+using Vector = std::vector<int>;
 
 static size_t summ = 0;
 static size_t checkSumm = 0;
@@ -45,13 +44,13 @@ UNIT_TEST(Simple_Threads)
   Vector vec;
 
   threads::Thread reader;
-  bool ok = reader.Create(my::make_unique<GeneratorThread>(vec));
+  bool ok = reader.Create(std::make_unique<GeneratorThread>(vec));
   TEST( ok, ("Create Generator thread") );
 
   reader.Join();
 
   threads::Thread writer;
-  ok = writer.Create(my::make_unique<ReaderThread>(vec));
+  ok = writer.Create(std::make_unique<ReaderThread>(vec));
   TEST( ok, ("Create Reader thread") );
 
   writer.Join();
diff --git a/base/mem_trie.hpp b/base/mem_trie.hpp
index 99a4265da6..f2d67fff3d 100644
--- a/base/mem_trie.hpp
+++ b/base/mem_trie.hpp
@@ -2,7 +2,6 @@
 
 #include "base/assert.hpp"
 #include "base/macros.hpp"
-#include "base/stl_add.hpp"
 
 #include <algorithm>
 #include <cstddef>
@@ -45,7 +44,7 @@ public:
     auto & node = m_subtrees[c];
     if (!node)
     {
-      node = my::make_unique<Subtree>();
+      node = std::make_unique<Subtree>();
       created = true;
     }
     else
@@ -100,7 +99,7 @@ public:
     }
 
     created = true;
-    m_subtrees.emplace_back(c, my::make_unique<Subtree>());
+    m_subtrees.emplace_back(c, std::make_unique<Subtree>());
     return *m_subtrees.back().second;
   }
 
@@ -266,7 +265,7 @@ public:
       }
 
       // We need to split the edge to |curr|.
-      auto node = my::make_unique<Node>();
+      auto node = std::make_unique<Node>();
 
       ASSERT_LESS(i, edge.Size(), ());
       node->m_edge = edge.DropFirst(i);
diff --git a/base/stl_add.hpp b/base/stl_add.hpp
index 7c65d73134..2eb4909014 100644
--- a/base/stl_add.hpp
+++ b/base/stl_add.hpp
@@ -9,14 +9,6 @@
 namespace my
 {
 using StringIL = std::initializer_list<char const *>;
-
-/// @todo(y): replace this hand-written helper function by
-/// std::make_unique when it will be available in C++14
-template <typename T, typename... Args>
-std::unique_ptr<T> make_unique(Args &&... args)
-{
-  return std::unique_ptr<T>(new T(std::forward<Args>(args)...));
-}
 }  // namespace my
 
 template <class ContainerT> class BackInsertFunctor
diff --git a/base/thread_pool.cpp b/base/thread_pool.cpp
index 99952809f0..1b20c78a8e 100644
--- a/base/thread_pool.cpp
+++ b/base/thread_pool.cpp
@@ -1,10 +1,10 @@
 #include "base/thread_pool.hpp"
 
-#include "base/stl_add.hpp"
 #include "base/thread.hpp"
 #include "base/threaded_list.hpp"
 
 #include <functional>
+#include <memory>
 #include <utility>
 #include <vector>
 
@@ -54,7 +54,7 @@ namespace threads
       for (auto & thread : m_threads)
       {
         thread.reset(new threads::Thread());
-        thread->Create(my::make_unique<PoolRoutine>(std::bind(&ThreadPool::Impl::PopFront, this), m_finishFn));
+        thread->Create(std::make_unique<PoolRoutine>(std::bind(&ThreadPool::Impl::PopFront, this), m_finishFn));
       }
     }