[Bf-blender-cvs] [a5cb7c1e62a] master: blenlib/ Any tests: fix self-assignment warning and typo

Ankit Meel noreply at git.blender.org
Fri Jan 14 15:04:11 CET 2022


Commit: a5cb7c1e62a07c17e346278b1c4e9ea58c9f54e0
Author: Ankit Meel
Date:   Fri Jan 14 19:32:29 2022 +0530
Branches: master
https://developer.blender.org/rBa5cb7c1e62a07c17e346278b1c4e9ea58c9f54e0

blenlib/ Any tests: fix self-assignment warning and typo

Fix assignment warning

source/blender/blenlib/tests/BLI_any_test.cc:56:5: warning: explicitly
assigning value of variable of type 'blender::Any<void, 8, 8>'
to itself [-Wself-assign-overloaded]
  c = c;

Reviewed By: JacquesLucke
Differential Revision: https://developer.blender.org/D13835

===================================================================

M	source/blender/blenlib/tests/BLI_any_test.cc

===================================================================

diff --git a/source/blender/blenlib/tests/BLI_any_test.cc b/source/blender/blenlib/tests/BLI_any_test.cc
index 436a1d5fa4a..d5871f46192 100644
--- a/source/blender/blenlib/tests/BLI_any_test.cc
+++ b/source/blender/blenlib/tests/BLI_any_test.cc
@@ -53,8 +53,12 @@ TEST(any, AssignMap)
   EXPECT_EQ((b.get<Map<int, int>>().lookup(4)), 2);
 
   Any<> c = std::move(a);
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wself-assign-overloaded"
+  /* Test valid state after self assignment. */
   c = c;
-  EXPECT_TRUE(b);
+#pragma clang diagnostic pop
+  EXPECT_TRUE(c);
   EXPECT_EQ((c.get<Map<int, int>>().lookup(4)), 2);
 
   EXPECT_TRUE((a.get<Map<int, int>>().is_empty())); /* NOLINT: bugprone-use-after-move */



More information about the Bf-blender-cvs mailing list