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

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSergey Sharybin <sergey@blender.org>2020-11-06 18:05:40 +0300
committerSergey Sharybin <sergey@blender.org>2020-11-06 18:47:16 +0300
commit3cb4c513080ebeead7c5629a7f0503fae9513803 (patch)
tree624947fc61a48c3c4bd681814a56456e093184e8 /source/blender/blenlib/tests
parentce70f2e1e0960c8b28dfbe3b9f5b4eeb7a49d317 (diff)
Cleanup: Clang-Tidy, modernize-make-unique
Diffstat (limited to 'source/blender/blenlib/tests')
-rw-r--r--source/blender/blenlib/tests/BLI_map_test.cc18
-rw-r--r--source/blender/blenlib/tests/BLI_set_test.cc6
-rw-r--r--source/blender/blenlib/tests/BLI_stack_cxx_test.cc4
-rw-r--r--source/blender/blenlib/tests/BLI_vector_set_test.cc6
-rw-r--r--source/blender/blenlib/tests/BLI_vector_test.cc8
5 files changed, 21 insertions, 21 deletions
diff --git a/source/blender/blenlib/tests/BLI_map_test.cc b/source/blender/blenlib/tests/BLI_map_test.cc
index e61d638c681..ecdf2627520 100644
--- a/source/blender/blenlib/tests/BLI_map_test.cc
+++ b/source/blender/blenlib/tests/BLI_map_test.cc
@@ -419,9 +419,9 @@ TEST(map, Clear)
TEST(map, UniquePtrValue)
{
- auto value1 = std::unique_ptr<int>(new int());
- auto value2 = std::unique_ptr<int>(new int());
- auto value3 = std::unique_ptr<int>(new int());
+ auto value1 = std::unique_ptr<int>(std::make_unique<int>());
+ auto value2 = std::unique_ptr<int>(std::make_unique<int>());
+ auto value3 = std::unique_ptr<int>(std::make_unique<int>());
int *value1_ptr = value1.get();
@@ -429,12 +429,12 @@ TEST(map, UniquePtrValue)
map.add_new(1, std::move(value1));
map.add(2, std::move(value2));
map.add_overwrite(3, std::move(value3));
- map.lookup_or_add_cb(4, []() { return std::unique_ptr<int>(new int()); });
- map.add_new(5, std::unique_ptr<int>(new int()));
- map.add(6, std::unique_ptr<int>(new int()));
- map.add_overwrite(7, std::unique_ptr<int>(new int()));
- map.lookup_or_add(8, std::unique_ptr<int>(new int()));
- map.pop_default(9, std::unique_ptr<int>(new int()));
+ map.lookup_or_add_cb(4, []() { return std::unique_ptr<int>(std::make_unique<int>()); });
+ map.add_new(5, std::unique_ptr<int>(std::make_unique<int>()));
+ map.add(6, std::unique_ptr<int>(std::make_unique<int>()));
+ map.add_overwrite(7, std::unique_ptr<int>(std::make_unique<int>()));
+ map.lookup_or_add(8, std::unique_ptr<int>(std::make_unique<int>()));
+ map.pop_default(9, std::unique_ptr<int>(std::make_unique<int>()));
EXPECT_EQ(map.lookup(1).get(), value1_ptr);
EXPECT_EQ(map.lookup_ptr(100), nullptr);
diff --git a/source/blender/blenlib/tests/BLI_set_test.cc b/source/blender/blenlib/tests/BLI_set_test.cc
index dbe820c9d15..840472e4c0b 100644
--- a/source/blender/blenlib/tests/BLI_set_test.cc
+++ b/source/blender/blenlib/tests/BLI_set_test.cc
@@ -221,10 +221,10 @@ TEST(set, OftenAddRemoveContained)
TEST(set, UniquePtrValues)
{
Set<std::unique_ptr<int>> set;
- set.add_new(std::unique_ptr<int>(new int()));
- auto value1 = std::unique_ptr<int>(new int());
+ set.add_new(std::unique_ptr<int>(std::make_unique<int>()));
+ auto value1 = std::unique_ptr<int>(std::make_unique<int>());
set.add_new(std::move(value1));
- set.add(std::unique_ptr<int>(new int()));
+ set.add(std::unique_ptr<int>(std::make_unique<int>()));
EXPECT_EQ(set.size(), 3);
}
diff --git a/source/blender/blenlib/tests/BLI_stack_cxx_test.cc b/source/blender/blenlib/tests/BLI_stack_cxx_test.cc
index c03893c5596..57e7bfdfdce 100644
--- a/source/blender/blenlib/tests/BLI_stack_cxx_test.cc
+++ b/source/blender/blenlib/tests/BLI_stack_cxx_test.cc
@@ -170,8 +170,8 @@ TEST(stack, Peek)
TEST(stack, UniquePtrValues)
{
Stack<std::unique_ptr<int>> stack;
- stack.push(std::unique_ptr<int>(new int()));
- stack.push(std::unique_ptr<int>(new int()));
+ stack.push(std::unique_ptr<int>(std::make_unique<int>()));
+ stack.push(std::unique_ptr<int>(std::make_unique<int>()));
std::unique_ptr<int> a = stack.pop();
std::unique_ptr<int> &b = stack.peek();
UNUSED_VARS(a, b);
diff --git a/source/blender/blenlib/tests/BLI_vector_set_test.cc b/source/blender/blenlib/tests/BLI_vector_set_test.cc
index 320cb15f450..cbdc597255a 100644
--- a/source/blender/blenlib/tests/BLI_vector_set_test.cc
+++ b/source/blender/blenlib/tests/BLI_vector_set_test.cc
@@ -142,9 +142,9 @@ TEST(vector_set, AddMultipleTimes)
TEST(vector_set, UniquePtrValue)
{
VectorSet<std::unique_ptr<int>> set;
- set.add_new(std::unique_ptr<int>(new int()));
- set.add(std::unique_ptr<int>(new int()));
- set.index_of_try(std::unique_ptr<int>(new int()));
+ set.add_new(std::unique_ptr<int>(std::make_unique<int>()));
+ set.add(std::unique_ptr<int>(std::make_unique<int>()));
+ set.index_of_try(std::unique_ptr<int>(std::make_unique<int>()));
std::unique_ptr<int> value = set.pop();
UNUSED_VARS(value);
}
diff --git a/source/blender/blenlib/tests/BLI_vector_test.cc b/source/blender/blenlib/tests/BLI_vector_test.cc
index e6b2e7c6365..ffdebd33873 100644
--- a/source/blender/blenlib/tests/BLI_vector_test.cc
+++ b/source/blender/blenlib/tests/BLI_vector_test.cc
@@ -456,10 +456,10 @@ TEST(vector, AppendNTimes)
TEST(vector, UniquePtrValue)
{
Vector<std::unique_ptr<int>> vec;
- vec.append(std::unique_ptr<int>(new int()));
- vec.append(std::unique_ptr<int>(new int()));
- vec.append(std::unique_ptr<int>(new int()));
- vec.append(std::unique_ptr<int>(new int()));
+ vec.append(std::unique_ptr<int>(std::make_unique<int>()));
+ vec.append(std::unique_ptr<int>(std::make_unique<int>()));
+ vec.append(std::unique_ptr<int>(std::make_unique<int>()));
+ vec.append(std::unique_ptr<int>(std::make_unique<int>()));
EXPECT_EQ(vec.size(), 4);
std::unique_ptr<int> &a = vec.last();