[Bf-blender-cvs] [7054d037012] master: Cleanup: Clang-tidy modernize-use-default-member-init

Ankit Meel noreply at git.blender.org
Fri Feb 5 14:40:49 CET 2021


Commit: 7054d03701250b245df9cf60b80c3c5e9aca308f
Author: Ankit Meel
Date:   Fri Feb 5 19:09:36 2021 +0530
Branches: master
https://developer.blender.org/rB7054d03701250b245df9cf60b80c3c5e9aca308f

Cleanup: Clang-tidy modernize-use-default-member-init

Using assignment syntax as we don't use `{}` initialization yet.

Reviewed By: sergey
Differential Revision: https://developer.blender.org/D9501

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

M	.clang-tidy
M	source/blender/blenlib/intern/mesh_intersect.cc

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

diff --git a/.clang-tidy b/.clang-tidy
index d65027687bb..d06c7471323 100644
--- a/.clang-tidy
+++ b/.clang-tidy
@@ -39,9 +39,11 @@ Checks:  >
   -modernize-use-nodiscard,
   -modernize-loop-convert,
   -modernize-pass-by-value,
-  -modernize-use-default-member-init,
   -modernize-raw-string-literal,
   -modernize-avoid-bind,
   -modernize-use-transparent-functors,
 
 WarningsAsErrors: '*'
+CheckOptions:
+  - key: modernize-use-default-member-init.UseAssignment
+    value: 1
diff --git a/source/blender/blenlib/intern/mesh_intersect.cc b/source/blender/blenlib/intern/mesh_intersect.cc
index 04f86734b8a..b2b8dd4e900 100644
--- a/source/blender/blenlib/intern/mesh_intersect.cc
+++ b/source/blender/blenlib/intern/mesh_intersect.cc
@@ -1055,25 +1055,22 @@ static std::ostream &operator<<(std::ostream &os, const CoplanarClusterInfo &cli
 enum ITT_value_kind { INONE, IPOINT, ISEGMENT, ICOPLANAR };
 
 struct ITT_value {
-  mpq3 p1;      /* Only relevant for IPOINT and ISEGMENT kind. */
-  mpq3 p2;      /* Only relevant for ISEGMENT kind. */
-  int t_source; /* Index of the source triangle that intersected the target one. */
-  enum ITT_value_kind kind;
+  mpq3 p1;           /* Only relevant for IPOINT and ISEGMENT kind. */
+  mpq3 p2;           /* Only relevant for ISEGMENT kind. */
+  int t_source = -1; /* Index of the source triangle that intersected the target one. */
+  enum ITT_value_kind kind = INONE;
 
-  ITT_value() : t_source(-1), kind(INONE)
-  {
-  }
-  ITT_value(ITT_value_kind k) : t_source(-1), kind(k)
+  ITT_value() = default;
+  explicit ITT_value(ITT_value_kind k) : kind(k)
   {
   }
   ITT_value(ITT_value_kind k, int tsrc) : t_source(tsrc), kind(k)
   {
   }
-  ITT_value(ITT_value_kind k, const mpq3 &p1) : p1(p1), t_source(-1), kind(k)
+  ITT_value(ITT_value_kind k, const mpq3 &p1) : p1(p1), kind(k)
   {
   }
-  ITT_value(ITT_value_kind k, const mpq3 &p1, const mpq3 &p2)
-      : p1(p1), p2(p2), t_source(-1), kind(k)
+  ITT_value(ITT_value_kind k, const mpq3 &p1, const mpq3 &p2) : p1(p1), p2(p2), kind(k)
   {
   }
   ITT_value(const ITT_value &other)



More information about the Bf-blender-cvs mailing list