[llvm] Migrate llvm::make_unique to std::make_unique
Now that we've moved to C++14, we no longer need the llvm::make_unique
implementation from STLExtras.h. This patch is a mechanical replacement
of (hopefully) all the llvm::make_unique instances across the monorepo.
llvm-svn: 369013
diff --git a/llvm/unittests/ADT/FunctionRefTest.cpp b/llvm/unittests/ADT/FunctionRefTest.cpp
index a599bee..5064a29 100644
--- a/llvm/unittests/ADT/FunctionRefTest.cpp
+++ b/llvm/unittests/ADT/FunctionRefTest.cpp
@@ -1,4 +1,4 @@
-//===- llvm/unittest/ADT/MakeUniqueTest.cpp - make_unique unit tests ------===//
+//===- llvm/unittest/ADT/MakeUniqueTest.cpp - std::make_unique unit tests ------===//
//
// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
// See https://llvm.org/LICENSE.txt for license information.
diff --git a/llvm/unittests/ADT/IteratorTest.cpp b/llvm/unittests/ADT/IteratorTest.cpp
index f46f109..2f5abb6 100644
--- a/llvm/unittests/ADT/IteratorTest.cpp
+++ b/llvm/unittests/ADT/IteratorTest.cpp
@@ -107,10 +107,10 @@
TEST(PointeeIteratorTest, SmartPointer) {
SmallVector<std::unique_ptr<int>, 4> V;
- V.push_back(make_unique<int>(1));
- V.push_back(make_unique<int>(2));
- V.push_back(make_unique<int>(3));
- V.push_back(make_unique<int>(4));
+ V.push_back(std::make_unique<int>(1));
+ V.push_back(std::make_unique<int>(2));
+ V.push_back(std::make_unique<int>(3));
+ V.push_back(std::make_unique<int>(4));
typedef pointee_iterator<
SmallVectorImpl<std::unique_ptr<int>>::const_iterator>
@@ -209,10 +209,10 @@
TEST(FilterIteratorTest, Composition) {
auto IsOdd = [](int N) { return N % 2 == 1; };
- std::unique_ptr<int> A[] = {make_unique<int>(0), make_unique<int>(1),
- make_unique<int>(2), make_unique<int>(3),
- make_unique<int>(4), make_unique<int>(5),
- make_unique<int>(6)};
+ std::unique_ptr<int> A[] = {make_unique<int>(0), std::make_unique<int>(1),
+ std::make_unique<int>(2), std::make_unique<int>(3),
+ std::make_unique<int>(4), std::make_unique<int>(5),
+ std::make_unique<int>(6)};
using PointeeIterator = pointee_iterator<std::unique_ptr<int> *>;
auto Range = make_filter_range(
make_range(PointeeIterator(std::begin(A)), PointeeIterator(std::end(A))),
diff --git a/llvm/unittests/ADT/MakeUniqueTest.cpp b/llvm/unittests/ADT/MakeUniqueTest.cpp
index c0c1096..d643d09 100644
--- a/llvm/unittests/ADT/MakeUniqueTest.cpp
+++ b/llvm/unittests/ADT/MakeUniqueTest.cpp
@@ -1,4 +1,4 @@
-//===- llvm/unittest/ADT/MakeUniqueTest.cpp - make_unique unit tests ------===//
+//===- llvm/unittest/ADT/MakeUniqueTest.cpp - std::make_unique unit tests ------===//
//
// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
// See https://llvm.org/LICENSE.txt for license information.
@@ -14,60 +14,60 @@
namespace {
TEST(MakeUniqueTest, SingleObject) {
- auto p0 = make_unique<int>();
+ auto p0 = std::make_unique<int>();
EXPECT_TRUE((bool)p0);
EXPECT_EQ(0, *p0);
- auto p1 = make_unique<int>(5);
+ auto p1 = std::make_unique<int>(5);
EXPECT_TRUE((bool)p1);
EXPECT_EQ(5, *p1);
- auto p2 = make_unique<std::tuple<int, int>>(0, 1);
+ auto p2 = std::make_unique<std::tuple<int, int>>(0, 1);
EXPECT_TRUE((bool)p2);
EXPECT_EQ(std::make_tuple(0, 1), *p2);
- auto p3 = make_unique<std::tuple<int, int, int>>(0, 1, 2);
+ auto p3 = std::make_unique<std::tuple<int, int, int>>(0, 1, 2);
EXPECT_TRUE((bool)p3);
EXPECT_EQ(std::make_tuple(0, 1, 2), *p3);
- auto p4 = make_unique<std::tuple<int, int, int, int>>(0, 1, 2, 3);
+ auto p4 = std::make_unique<std::tuple<int, int, int, int>>(0, 1, 2, 3);
EXPECT_TRUE((bool)p4);
EXPECT_EQ(std::make_tuple(0, 1, 2, 3), *p4);
- auto p5 = make_unique<std::tuple<int, int, int, int, int>>(0, 1, 2, 3, 4);
+ auto p5 = std::make_unique<std::tuple<int, int, int, int, int>>(0, 1, 2, 3, 4);
EXPECT_TRUE((bool)p5);
EXPECT_EQ(std::make_tuple(0, 1, 2, 3, 4), *p5);
auto p6 =
- make_unique<std::tuple<int, int, int, int, int, int>>(0, 1, 2, 3, 4, 5);
+ std::make_unique<std::tuple<int, int, int, int, int, int>>(0, 1, 2, 3, 4, 5);
EXPECT_TRUE((bool)p6);
EXPECT_EQ(std::make_tuple(0, 1, 2, 3, 4, 5), *p6);
- auto p7 = make_unique<std::tuple<int, int, int, int, int, int, int>>(
+ auto p7 = std::make_unique<std::tuple<int, int, int, int, int, int, int>>(
0, 1, 2, 3, 4, 5, 6);
EXPECT_TRUE((bool)p7);
EXPECT_EQ(std::make_tuple(0, 1, 2, 3, 4, 5, 6), *p7);
- auto p8 = make_unique<std::tuple<int, int, int, int, int, int, int, int>>(
+ auto p8 = std::make_unique<std::tuple<int, int, int, int, int, int, int, int>>(
0, 1, 2, 3, 4, 5, 6, 7);
EXPECT_TRUE((bool)p8);
EXPECT_EQ(std::make_tuple(0, 1, 2, 3, 4, 5, 6, 7), *p8);
auto p9 =
- make_unique<std::tuple<int, int, int, int, int, int, int, int, int>>(
+ std::make_unique<std::tuple<int, int, int, int, int, int, int, int, int>>(
0, 1, 2, 3, 4, 5, 6, 7, 8);
EXPECT_TRUE((bool)p9);
EXPECT_EQ(std::make_tuple(0, 1, 2, 3, 4, 5, 6, 7, 8), *p9);
auto p10 =
- make_unique<std::tuple<int, int, int, int, int, int, int, int, int, int>>(
+ std::make_unique<std::tuple<int, int, int, int, int, int, int, int, int, int>>(
0, 1, 2, 3, 4, 5, 6, 7, 8, 9);
EXPECT_TRUE((bool)p10);
EXPECT_EQ(std::make_tuple(0, 1, 2, 3, 4, 5, 6, 7, 8, 9), *p10);
}
TEST(MakeUniqueTest, Array) {
- auto p1 = make_unique<int[]>(2);
+ auto p1 = std::make_unique<int[]>(2);
EXPECT_TRUE((bool)p1);
EXPECT_EQ(0, p1[0]);
EXPECT_EQ(0, p1[1]);
diff --git a/llvm/unittests/ADT/MapVectorTest.cpp b/llvm/unittests/ADT/MapVectorTest.cpp
index b8fdbdd..f7e5812 100644
--- a/llvm/unittests/ADT/MapVectorTest.cpp
+++ b/llvm/unittests/ADT/MapVectorTest.cpp
@@ -149,8 +149,8 @@
TEST(MapVectorTest, NonCopyable) {
MapVector<int, std::unique_ptr<int>> MV;
- MV.insert(std::make_pair(1, llvm::make_unique<int>(1)));
- MV.insert(std::make_pair(2, llvm::make_unique<int>(2)));
+ MV.insert(std::make_pair(1, std::make_unique<int>(1)));
+ MV.insert(std::make_pair(2, std::make_unique<int>(2)));
ASSERT_EQ(MV.count(1), 1u);
ASSERT_EQ(*MV.find(2)->second, 2);
@@ -306,8 +306,8 @@
TEST(SmallMapVectorSmallTest, NonCopyable) {
SmallMapVector<int, std::unique_ptr<int>, 8> MV;
- MV.insert(std::make_pair(1, llvm::make_unique<int>(1)));
- MV.insert(std::make_pair(2, llvm::make_unique<int>(2)));
+ MV.insert(std::make_pair(1, std::make_unique<int>(1)));
+ MV.insert(std::make_pair(2, std::make_unique<int>(2)));
ASSERT_EQ(MV.count(1), 1u);
ASSERT_EQ(*MV.find(2)->second, 2);
diff --git a/llvm/unittests/ADT/STLExtrasTest.cpp b/llvm/unittests/ADT/STLExtrasTest.cpp
index 8704ddd..4cbef90 100644
--- a/llvm/unittests/ADT/STLExtrasTest.cpp
+++ b/llvm/unittests/ADT/STLExtrasTest.cpp
@@ -451,7 +451,7 @@
EXPECT_EQ(V1, to_address(V1));
// Check fancy pointer overload for unique_ptr
- std::unique_ptr<int> V2 = make_unique<int>(0);
+ std::unique_ptr<int> V2 = std::make_unique<int>(0);
EXPECT_EQ(V2.get(), to_address(V2));
V2.reset(V1);