From 3cb4c513080ebeead7c5629a7f0503fae9513803 Mon Sep 17 00:00:00 2001 From: Sergey Sharybin Date: Fri, 6 Nov 2020 16:05:40 +0100 Subject: [PATCH] Cleanup: Clang-Tidy, modernize-make-unique --- .clang-tidy | 1 - .../blender/blenlib/intern/mesh_intersect.cc | 2 +- source/blender/blenlib/tests/BLI_map_test.cc | 18 +++++++++--------- source/blender/blenlib/tests/BLI_set_test.cc | 6 +++--- .../blenlib/tests/BLI_stack_cxx_test.cc | 4 ++-- .../blenlib/tests/BLI_vector_set_test.cc | 6 +++--- .../blender/blenlib/tests/BLI_vector_test.cc | 8 ++++---- .../freestyle/intern/view_map/AutoPtrHelper.h | 4 ++++ .../intern/view_map/ViewMapBuilder.cpp | 16 ++++++++-------- 9 files changed, 34 insertions(+), 31 deletions(-) diff --git a/.clang-tidy b/.clang-tidy index af1f779a056..70851d0023f 100644 --- a/.clang-tidy +++ b/.clang-tidy @@ -45,7 +45,6 @@ Checks: > -modernize-loop-convert, -modernize-pass-by-value, -modernize-use-default-member-init, - -modernize-make-unique, -modernize-raw-string-literal, -modernize-avoid-bind, -modernize-use-override, diff --git a/source/blender/blenlib/intern/mesh_intersect.cc b/source/blender/blenlib/intern/mesh_intersect.cc index b1b8bd61b40..6647f8b8c92 100644 --- a/source/blender/blenlib/intern/mesh_intersect.cc +++ b/source/blender/blenlib/intern/mesh_intersect.cc @@ -519,7 +519,7 @@ class IMeshArena::IMeshArenaImpl : NonCopyable, NonMovable { IMeshArena::IMeshArena() { - pimpl_ = std::unique_ptr(new IMeshArenaImpl()); + pimpl_ = std::unique_ptr(std::make_unique()); } IMeshArena::~IMeshArena() 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(new int()); - auto value2 = std::unique_ptr(new int()); - auto value3 = std::unique_ptr(new int()); + auto value1 = std::unique_ptr(std::make_unique()); + auto value2 = std::unique_ptr(std::make_unique()); + auto value3 = std::unique_ptr(std::make_unique()); 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(new int()); }); - map.add_new(5, std::unique_ptr(new int())); - map.add(6, std::unique_ptr(new int())); - map.add_overwrite(7, std::unique_ptr(new int())); - map.lookup_or_add(8, std::unique_ptr(new int())); - map.pop_default(9, std::unique_ptr(new int())); + map.lookup_or_add_cb(4, []() { return std::unique_ptr(std::make_unique()); }); + map.add_new(5, std::unique_ptr(std::make_unique())); + map.add(6, std::unique_ptr(std::make_unique())); + map.add_overwrite(7, std::unique_ptr(std::make_unique())); + map.lookup_or_add(8, std::unique_ptr(std::make_unique())); + map.pop_default(9, std::unique_ptr(std::make_unique())); 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> set; - set.add_new(std::unique_ptr(new int())); - auto value1 = std::unique_ptr(new int()); + set.add_new(std::unique_ptr(std::make_unique())); + auto value1 = std::unique_ptr(std::make_unique()); set.add_new(std::move(value1)); - set.add(std::unique_ptr(new int())); + set.add(std::unique_ptr(std::make_unique())); 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> stack; - stack.push(std::unique_ptr(new int())); - stack.push(std::unique_ptr(new int())); + stack.push(std::unique_ptr(std::make_unique())); + stack.push(std::unique_ptr(std::make_unique())); std::unique_ptr a = stack.pop(); std::unique_ptr &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> set; - set.add_new(std::unique_ptr(new int())); - set.add(std::unique_ptr(new int())); - set.index_of_try(std::unique_ptr(new int())); + set.add_new(std::unique_ptr(std::make_unique())); + set.add(std::unique_ptr(std::make_unique())); + set.index_of_try(std::unique_ptr(std::make_unique())); std::unique_ptr 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> vec; - vec.append(std::unique_ptr(new int())); - vec.append(std::unique_ptr(new int())); - vec.append(std::unique_ptr(new int())); - vec.append(std::unique_ptr(new int())); + vec.append(std::unique_ptr(std::make_unique())); + vec.append(std::unique_ptr(std::make_unique())); + vec.append(std::unique_ptr(std::make_unique())); + vec.append(std::unique_ptr(std::make_unique())); EXPECT_EQ(vec.size(), 4); std::unique_ptr &a = vec.last(); diff --git a/source/blender/freestyle/intern/view_map/AutoPtrHelper.h b/source/blender/freestyle/intern/view_map/AutoPtrHelper.h index 94fd80bc0fb..cfcfa5e651b 100644 --- a/source/blender/freestyle/intern/view_map/AutoPtrHelper.h +++ b/source/blender/freestyle/intern/view_map/AutoPtrHelper.h @@ -27,6 +27,8 @@ namespace Freestyle { template class AutoPtr : public std::unique_ptr { public: + using std::unique_ptr::unique_ptr; + AutoPtr() : std::unique_ptr() { } @@ -42,6 +44,8 @@ template class AutoPtr : public std::unique_ptr { other.release(); } + using std::unique_ptr::operator=; + template AutoPtr &operator=(AutoPtr &other) = delete; }; diff --git a/source/blender/freestyle/intern/view_map/ViewMapBuilder.cpp b/source/blender/freestyle/intern/view_map/ViewMapBuilder.cpp index e7d4ec6aa6e..91f3aeac184 100644 --- a/source/blender/freestyle/intern/view_map/ViewMapBuilder.cpp +++ b/source/blender/freestyle/intern/view_map/ViewMapBuilder.cpp @@ -1381,17 +1381,17 @@ void ViewMapBuilder::ComputeCumulativeVisibility(ViewMap *ioViewMap, AutoPtr source; if (_orthographicProjection) { - transform.reset(new BoxGrid::Transform); + transform = std::make_unique(); } else { - transform.reset(new SphericalGrid::Transform); + transform = std::make_unique(); } if (cull) { - source.reset(new CulledOccluderSource(*transform, we, *ioViewMap, true)); + source = std::make_unique(*transform, we, *ioViewMap, true); } else { - source.reset(new OccluderSource(*transform, we)); + source = std::make_unique(*transform, we); } AutoPtr density(factory.newGridDensityProvider(*source, bbox, *transform)); @@ -1419,17 +1419,17 @@ void ViewMapBuilder::ComputeDetailedVisibility(ViewMap *ioViewMap, AutoPtr source; if (_orthographicProjection) { - transform.reset(new BoxGrid::Transform); + transform = std::make_unique(); } else { - transform.reset(new SphericalGrid::Transform); + transform = std::make_unique(); } if (cull) { - source.reset(new CulledOccluderSource(*transform, we, *ioViewMap, true)); + source = std::make_unique(*transform, we, *ioViewMap, true); } else { - source.reset(new OccluderSource(*transform, we)); + source = std::make_unique(*transform, we); } AutoPtr density(factory.newGridDensityProvider(*source, bbox, *transform));