Added modernize-return-braced-init-list to clang-tidy checks (#5593)

* Added modernize-return-braced-init-list clang-tidy

Added modernize-return-braced-init-list clang-tidy check


Fixed issues flagged by clang-tidy


Fixed clang-tidy complaints from CI


Worked around clang bug with explicit constructor


Fixed unrelated unused typedef error


Fixed formatting issue

* Reverted formatting changes per review

* Restored braced-init-list return

* *Really* revert formatting this time

* Commented NOLINT instances more clearly

Author: gnawme

.clang-tidy

@@ -7,6 +7,7 @@ Checks: >
     modernize-deprecated-headers,
     modernize-redundant-void-arg,
     modernize-replace-random-shuffle,
+    modernize-return-braced-init-list,
     modernize-use-auto,
     modernize-use-equals-default,
     modernize-use-equals-delete,

common/include/pcl/common/impl/eigen.hpp

@@ -285,8 +285,7 @@ getLargest3x3Eigenvector (const Matrix scaledMatrix)
 
   Index index;
   const Scalar length = len.maxCoeff (&index);  // <- first evaluation
-  return EigenVector<Vector, Scalar> {crossProduct.row (index) / length,
-                                      length};
+  return {crossProduct.row (index) / length, length};
 }
 
 }  // namespace detail

common/include/pcl/range_image/impl/range_image.hpp

@@ -682,7 +682,7 @@ RangeImage::getAcutenessValue (int x1, int y1, int x2, int y2) const
 const Eigen::Vector3f 
 RangeImage::getSensorPos () const
 {
-  return Eigen::Vector3f (to_world_system_ (0,3), to_world_system_ (1,3), to_world_system_ (2,3));
+  return {to_world_system_ (0,3), to_world_system_ (1,3), to_world_system_ (2,3)};
 }
 
 /////////////////////////////////////////////////////////////////////////
@@ -801,7 +801,7 @@ RangeImage::getMaxAngleSize (const Eigen::Affine3f& viewer_pose, const Eigen::Ve
 Eigen::Vector3f 
 RangeImage::getEigenVector3f (const PointWithRange& point)
 {
-  return Eigen::Vector3f (point.x, point.y, point.z);
+  return {point.x, point.y, point.z};
 }
 
 /////////////////////////////////////////////////////////////////////////

filters/include/pcl/filters/normal_refinement.h

@@ -64,7 +64,11 @@ namespace pcl
       PCL_ERROR("[pcl::assignNormalWeights] inequal size of neighbor indices and distances!\n");
 
     // TODO: For now we use uniform weights
-    return (std::vector<float> (k_indices.size (), 1.0f));
+    // Disable check for braced-initialization,
+    // since the compiler doesn't seem to recognize that
+    // {k_indices.size (), 1.0f} is selecting the vector(size_type count, const T&) constructor
+    // NOLINTNEXTLINE(modernize-return-braced-init-list)
+    return std::vector<float> (k_indices.size (), 1.0f);
   }
 
   /** \brief Refine an indexed point based on its neighbors, this function only writes to the normal_* fields

filters/include/pcl/filters/voxel_grid.h

@@ -362,9 +362,9 @@ namespace pcl
       inline Eigen::Vector3i
       getGridCoordinates (float x, float y, float z) const
       {
-        return (Eigen::Vector3i (static_cast<int> (std::floor (x * inverse_leaf_size_[0])),
+        return {static_cast<int> (std::floor (x * inverse_leaf_size_[0])),
                                  static_cast<int> (std::floor (y * inverse_leaf_size_[1])),
-                                 static_cast<int> (std::floor (z * inverse_leaf_size_[2]))));
+                                 static_cast<int> (std::floor (z * inverse_leaf_size_[2]))};
       }
 
       /** \brief Returns the index in the downsampled cloud corresponding to a given set of coordinates.
@@ -710,9 +710,9 @@ namespace pcl
       inline Eigen::Vector3i
       getGridCoordinates (float x, float y, float z) const
       {
-        return (Eigen::Vector3i (static_cast<int> (std::floor (x * inverse_leaf_size_[0])),
+        return {static_cast<int> (std::floor (x * inverse_leaf_size_[0])),
                                  static_cast<int> (std::floor (y * inverse_leaf_size_[1])),
-                                 static_cast<int> (std::floor (z * inverse_leaf_size_[2]))));
+                                 static_cast<int> (std::floor (z * inverse_leaf_size_[2]))};
       }
 
       /** \brief Returns the index in the downsampled cloud corresponding to a given set of coordinates.

filters/include/pcl/filters/voxel_grid_occlusion_estimation.h

@@ -227,9 +227,9 @@ namespace pcl
       inline Eigen::Vector3i
       getGridCoordinatesRound (float x, float y, float z) 
       {
-        return Eigen::Vector3i (static_cast<int> (round (x * inverse_leaf_size_[0])), 
-                                static_cast<int> (round (y * inverse_leaf_size_[1])), 
-                                static_cast<int> (round (z * inverse_leaf_size_[2])));
+        return {static_cast<int> (round (x * inverse_leaf_size_[0])),
+                                static_cast<int> (round (y * inverse_leaf_size_[1])),
+                                static_cast<int> (round (z * inverse_leaf_size_[2]))};
       }
 
       // initialization flag

geometry/include/pcl/geometry/mesh_base.h

@@ -1091,7 +1091,7 @@ class MeshBase {
              &vertex_data <= &vertex_data_cloud_.back());
       return (VertexIndex(std::distance(&vertex_data_cloud_.front(), &vertex_data)));
     }
-    return (VertexIndex());
+    return {};
   }
 
   /** \brief Get the index associated to the given half-edge data. */
@@ -1104,7 +1104,7 @@ class MeshBase {
       return (HalfEdgeIndex(
           std::distance(&half_edge_data_cloud_.front(), &half_edge_data)));
     }
-    return (HalfEdgeIndex());
+    return {};
   }
 
   /** \brief Get the index associated to the given edge data. */
@@ -1116,7 +1116,7 @@ class MeshBase {
              &edge_data <= &edge_data_cloud_.back());
       return (EdgeIndex(std::distance(&edge_data_cloud_.front(), &edge_data)));
     }
-    return (EdgeIndex());
+    return {};
   }
 
   /** \brief Get the index associated to the given face data. */
@@ -1128,7 +1128,7 @@ class MeshBase {
              &face_data <= &face_data_cloud_.back());
       return (FaceIndex(std::distance(&face_data_cloud_.front(), &face_data)));
     }
-    return (FaceIndex());
+    return {};
   }
 
 protected:
@@ -1162,7 +1162,7 @@ class MeshBase {
   {
     const int n = static_cast<int>(vertices.size());
     if (n < 3)
-      return (FaceIndex());
+      return {};
 
     // Check for topological errors
     inner_he_.resize(n);
@@ -1175,7 +1175,7 @@ class MeshBase {
                                 inner_he_[i],
                                 is_new_[i],
                                 IsManifold())) {
-        return (FaceIndex());
+        return {};
       }
     }
     for (int i = 0; i < n; ++i) {
@@ -1188,7 +1188,7 @@ class MeshBase {
                                 make_adjacent_[i],
                                 free_he_[i],
                                 IsManifold())) {
-        return (FaceIndex());
+        return {};
       }
     }
 

io/include/pcl/io/dinast_grabber.h

@@ -81,7 +81,7 @@ namespace pcl
         */
       std::string
       getName () const override
-      { return (std::string ("DinastGrabber")); }
+      { return {"DinastGrabber"}; }
 
       /** \brief Start the data acquisition process.
         */

io/include/pcl/io/real_sense_2_grabber.h

@@ -101,7 +101,8 @@ namespace pcl
 
     /** \brief defined grabber name*/
     std::string
-    getName () const override { return std::string ( "RealSense2Grabber" ); }
+    getName () const override {
+      return {"RealSense2Grabber"}; }
 
     //define callback signature typedefs
     using signal_librealsense_PointXYZ = void( const pcl::PointCloud<pcl::PointXYZ>::ConstPtr& );

io/src/dinast_grabber.cpp

@@ -204,7 +204,7 @@ pcl::DinastGrabber::getDeviceVersion ()
      PCL_THROW_EXCEPTION (pcl::IOException, "[pcl::DinastGrabber::getDeviceVersion] Error trying to get device version");
 
   //data[21] = 0;
-  return (std::string (reinterpret_cast<const char*> (data)));
+  return {reinterpret_cast<const char*>(data)};
 }
 
 //////////////////////////////////////////////////////////////////////////////////////////////////////////////////