Merge pull request #546 from ManifoldFR/topic/update-clang-format-cpp-standard

Update C++ standard for clang-format to 11, apply updated formatting rules

Author: jorisv

.clang-format

@@ -1,3 +1,3 @@
 BasedOnStyle: Google
 SortIncludes: false
-Standard: Cpp03
+Standard: Cpp11

.git-blame-ignore-revs

@@ -6,3 +6,6 @@
 
 # pre-commit run -a (Guilhem Saurel, 2024-02-19)
 0bae435330ee475f8dbb11bf5e672284d294d9b3
+
+# pre-commit run -a (ManifoldFR, 2025-04-25)
+51b49061575d46e0668eba0da200217cbfd9e883

.pre-commit-config.yaml

@@ -26,8 +26,6 @@ repos:
   rev: v20.1.0
   hooks:
   - id: clang-format
-    args:
-    - '--style={BasedOnStyle: Google, SortIncludes: false, Standard: Cpp03}'
 - repo: https://github.com/pre-commit/pre-commit-hooks
   rev: v5.0.0
   hooks:

CHANGELOG.md

@@ -10,6 +10,10 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 
 - Fix handling of non sorted sparse matrix ([#538](https://github.com/stack-of-tasks/eigenpy/pull/538))
 
+### Changed
+
+- Update clang-format standard to C++11, reformat code
+
 ## [3.10.3] - 2025-02-11
 
 ### Added

include/eigenpy/alignment.hpp

@@ -108,8 +108,8 @@ namespace objects {
 
 // Force alignment of instance with value_holder
 template <typename Derived>
-struct instance<value_holder<Derived> >
-    : ::eigenpy::aligned_instance<value_holder<Derived> > {};
+struct instance<value_holder<Derived>>
+    : ::eigenpy::aligned_instance<value_holder<Derived>> {};
 
 }  // namespace objects
 }  // namespace python

include/eigenpy/angle-axis.hpp

@@ -13,7 +13,7 @@ template <typename AngleAxis>
 class AngleAxisVisitor;
 
 template <typename Scalar>
-struct call<Eigen::AngleAxis<Scalar> > {
+struct call<Eigen::AngleAxis<Scalar>> {
   typedef Eigen::AngleAxis<Scalar> AngleAxis;
 
   static inline void expose() { AngleAxisVisitor<AngleAxis>::expose(); }
@@ -26,7 +26,7 @@ struct call<Eigen::AngleAxis<Scalar> > {
 };
 
 template <typename AngleAxis>
-class AngleAxisVisitor : public bp::def_visitor<AngleAxisVisitor<AngleAxis> > {
+class AngleAxisVisitor : public bp::def_visitor<AngleAxisVisitor<AngleAxis>> {
   typedef typename AngleAxis::Scalar Scalar;
   typedef typename AngleAxis::Vector3 Vector3;
   typedef typename AngleAxis::Matrix3 Matrix3;

include/eigenpy/copyable.hpp

@@ -15,7 +15,7 @@ namespace eigenpy {
 /// copy constructor.
 ///
 template <class C>
-struct CopyableVisitor : public bp::def_visitor<CopyableVisitor<C> > {
+struct CopyableVisitor : public bp::def_visitor<CopyableVisitor<C>> {
   template <class PyClass>
   void visit(PyClass& cl) const {
     cl.def("copy", &copy, bp::arg("self"), "Returns a copy of *this.");

include/eigenpy/decompositions/ColPivHouseholderQR.hpp

@@ -15,7 +15,7 @@ namespace eigenpy {
 template <typename _MatrixType>
 struct ColPivHouseholderQRSolverVisitor
     : public boost::python::def_visitor<
-          ColPivHouseholderQRSolverVisitor<_MatrixType> > {
+          ColPivHouseholderQRSolverVisitor<_MatrixType>> {
   typedef _MatrixType MatrixType;
   typedef typename MatrixType::Scalar Scalar;
   typedef typename MatrixType::RealScalar RealScalar;

include/eigenpy/decompositions/CompleteOrthogonalDecomposition.hpp

@@ -15,7 +15,7 @@ namespace eigenpy {
 template <typename _MatrixType>
 struct CompleteOrthogonalDecompositionSolverVisitor
     : public boost::python::def_visitor<
-          CompleteOrthogonalDecompositionSolverVisitor<_MatrixType> > {
+          CompleteOrthogonalDecompositionSolverVisitor<_MatrixType>> {
   typedef _MatrixType MatrixType;
   typedef typename MatrixType::Scalar Scalar;
   typedef typename MatrixType::RealScalar RealScalar;

include/eigenpy/decompositions/EigenSolver.hpp

@@ -16,7 +16,7 @@ namespace eigenpy {
 
 template <typename _MatrixType>
 struct EigenSolverVisitor
-    : public boost::python::def_visitor<EigenSolverVisitor<_MatrixType> > {
+    : public boost::python::def_visitor<EigenSolverVisitor<_MatrixType>> {
   typedef _MatrixType MatrixType;
   typedef typename MatrixType::Scalar Scalar;
   typedef Eigen::EigenSolver<MatrixType> Solver;
@@ -26,7 +26,7 @@ struct EigenSolverVisitor
     cl.def(bp::init<>("Default constructor"))
         .def(bp::init<Eigen::DenseIndex>(
             bp::arg("size"), "Default constructor with memory preallocation"))
-        .def(bp::init<MatrixType, bp::optional<bool> >(
+        .def(bp::init<MatrixType, bp::optional<bool>>(
             bp::args("matrix", "compute_eigen_vectors"),
             "Computes eigendecomposition of given matrix"))
 

include/eigenpy/decompositions/FullPivHouseholderQR.hpp

@@ -15,7 +15,7 @@ namespace eigenpy {
 template <typename _MatrixType>
 struct FullPivHouseholderQRSolverVisitor
     : public boost::python::def_visitor<
-          FullPivHouseholderQRSolverVisitor<_MatrixType> > {
+          FullPivHouseholderQRSolverVisitor<_MatrixType>> {
   typedef _MatrixType MatrixType;
   typedef typename MatrixType::Scalar Scalar;
   typedef typename MatrixType::RealScalar RealScalar;

include/eigenpy/decompositions/HouseholderQR.hpp

@@ -15,7 +15,7 @@ namespace eigenpy {
 template <typename _MatrixType>
 struct HouseholderQRSolverVisitor
     : public boost::python::def_visitor<
-          HouseholderQRSolverVisitor<_MatrixType> > {
+          HouseholderQRSolverVisitor<_MatrixType>> {
   typedef _MatrixType MatrixType;
   typedef typename MatrixType::Scalar Scalar;
   typedef typename MatrixType::RealScalar RealScalar;

include/eigenpy/decompositions/LDLT.hpp

@@ -16,7 +16,7 @@ namespace eigenpy {
 
 template <typename _MatrixType>
 struct LDLTSolverVisitor
-    : public boost::python::def_visitor<LDLTSolverVisitor<_MatrixType> > {
+    : public boost::python::def_visitor<LDLTSolverVisitor<_MatrixType>> {
   typedef _MatrixType MatrixType;
   typedef typename MatrixType::Scalar Scalar;
   typedef typename MatrixType::RealScalar RealScalar;

include/eigenpy/decompositions/LLT.hpp

@@ -16,7 +16,7 @@ namespace eigenpy {
 
 template <typename _MatrixType>
 struct LLTSolverVisitor
-    : public boost::python::def_visitor<LLTSolverVisitor<_MatrixType> > {
+    : public boost::python::def_visitor<LLTSolverVisitor<_MatrixType>> {
   typedef _MatrixType MatrixType;
   typedef typename MatrixType::Scalar Scalar;
   typedef typename MatrixType::RealScalar RealScalar;

include/eigenpy/decompositions/PermutationMatrix.hpp

@@ -14,7 +14,7 @@ template <int SizeAtCompileTime, int MaxSizeAtCompileTime = SizeAtCompileTime,
           typename StorageIndex_ = int>
 struct PermutationMatrixVisitor
     : public boost::python::def_visitor<PermutationMatrixVisitor<
-          SizeAtCompileTime, MaxSizeAtCompileTime, StorageIndex_> > {
+          SizeAtCompileTime, MaxSizeAtCompileTime, StorageIndex_>> {
   typedef StorageIndex_ StorageIndex;
   typedef Eigen::PermutationMatrix<SizeAtCompileTime, MaxSizeAtCompileTime,
                                    StorageIndex>

include/eigenpy/decompositions/SelfAdjointEigenSolver.hpp

@@ -17,7 +17,7 @@ namespace eigenpy {
 template <typename _MatrixType>
 struct SelfAdjointEigenSolverVisitor
     : public boost::python::def_visitor<
-          SelfAdjointEigenSolverVisitor<_MatrixType> > {
+          SelfAdjointEigenSolverVisitor<_MatrixType>> {
   typedef _MatrixType MatrixType;
   typedef typename MatrixType::Scalar Scalar;
   typedef Eigen::SelfAdjointEigenSolver<MatrixType> Solver;
@@ -28,7 +28,7 @@ struct SelfAdjointEigenSolverVisitor
         .def(bp::init<Eigen::DenseIndex>(
             bp::args("self", "size"),
             "Default constructor with memory preallocation"))
-        .def(bp::init<MatrixType, bp::optional<int> >(
+        .def(bp::init<MatrixType, bp::optional<int>>(
             bp::args("self", "matrix", "options"),
             "Computes eigendecomposition of given matrix"))
 

include/eigenpy/decompositions/minres.hpp

@@ -15,7 +15,7 @@
 namespace eigenpy {
 template <typename _Solver>
 struct IterativeSolverBaseVisitor
-    : public boost::python::def_visitor<IterativeSolverBaseVisitor<_Solver> > {
+    : public boost::python::def_visitor<IterativeSolverBaseVisitor<_Solver>> {
   typedef _Solver Solver;
   typedef typename Solver::MatrixType MatrixType;
   typedef typename Solver::Preconditioner Preconditioner;
@@ -123,7 +123,7 @@ struct IterativeSolverBaseVisitor
 
 template <typename _MatrixType>
 struct MINRESSolverVisitor
-    : public boost::python::def_visitor<MINRESSolverVisitor<_MatrixType> > {
+    : public boost::python::def_visitor<MINRESSolverVisitor<_MatrixType>> {
   typedef _MatrixType MatrixType;
   typedef typename MatrixType::Scalar Scalar;
   typedef typename MatrixType::RealScalar RealScalar;

include/eigenpy/decompositions/sparse/LDLT.hpp

@@ -13,10 +13,10 @@ namespace eigenpy {
 
 template <typename _MatrixType, int _UpLo = Eigen::Lower,
           typename _Ordering =
-              Eigen::AMDOrdering<typename _MatrixType::StorageIndex> >
+              Eigen::AMDOrdering<typename _MatrixType::StorageIndex>>
 struct SimplicialLDLTVisitor
     : public boost::python::def_visitor<
-          SimplicialLDLTVisitor<_MatrixType, _UpLo, _Ordering> > {
+          SimplicialLDLTVisitor<_MatrixType, _UpLo, _Ordering>> {
   typedef SimplicialLDLTVisitor<_MatrixType, _UpLo, _Ordering> Visitor;
   typedef _MatrixType MatrixType;
 

include/eigenpy/decompositions/sparse/LLT.hpp

@@ -13,10 +13,10 @@ namespace eigenpy {
 
 template <typename _MatrixType, int _UpLo = Eigen::Lower,
           typename _Ordering =
-              Eigen::AMDOrdering<typename _MatrixType::StorageIndex> >
+              Eigen::AMDOrdering<typename _MatrixType::StorageIndex>>
 struct SimplicialLLTVisitor
     : public boost::python::def_visitor<
-          SimplicialLLTVisitor<_MatrixType, _UpLo, _Ordering> > {
+          SimplicialLLTVisitor<_MatrixType, _UpLo, _Ordering>> {
   typedef SimplicialLLTVisitor<_MatrixType, _UpLo, _Ordering> Visitor;
   typedef _MatrixType MatrixType;
 

include/eigenpy/decompositions/sparse/SimplicialCholesky.hpp

@@ -16,7 +16,7 @@ namespace eigenpy {
 template <typename SimplicialDerived>
 struct SimplicialCholeskyVisitor
     : public boost::python::def_visitor<
-          SimplicialCholeskyVisitor<SimplicialDerived> > {
+          SimplicialCholeskyVisitor<SimplicialDerived>> {
   typedef SimplicialDerived Solver;
 
   typedef typename SimplicialDerived::MatrixType MatrixType;

include/eigenpy/decompositions/sparse/SparseSolverBase.hpp

@@ -15,7 +15,7 @@ namespace eigenpy {
 template <typename SimplicialDerived>
 struct SparseSolverBaseVisitor
     : public boost::python::def_visitor<
-          SparseSolverBaseVisitor<SimplicialDerived> > {
+          SparseSolverBaseVisitor<SimplicialDerived>> {
   typedef SimplicialDerived Solver;
 
   typedef typename SimplicialDerived::MatrixType MatrixType;

include/eigenpy/decompositions/sparse/accelerate/accelerate.hpp

@@ -15,7 +15,7 @@ namespace eigenpy {
 
 template <typename AccelerateDerived>
 struct AccelerateImplVisitor : public boost::python::def_visitor<
-                                   AccelerateImplVisitor<AccelerateDerived> > {
+                                   AccelerateImplVisitor<AccelerateDerived>> {
   typedef AccelerateDerived Solver;
 
   typedef typename AccelerateDerived::MatrixType MatrixType;

include/eigenpy/decompositions/sparse/cholmod/CholmodBase.hpp

@@ -15,7 +15,7 @@ namespace eigenpy {
 
 template <typename CholdmodDerived>
 struct CholmodBaseVisitor
-    : public boost::python::def_visitor<CholmodBaseVisitor<CholdmodDerived> > {
+    : public boost::python::def_visitor<CholmodBaseVisitor<CholdmodDerived>> {
   typedef CholdmodDerived Solver;
 
   typedef typename CholdmodDerived::MatrixType MatrixType;

include/eigenpy/decompositions/sparse/cholmod/CholmodDecomposition.hpp

@@ -13,7 +13,7 @@ namespace eigenpy {
 template <typename CholdmodDerived>
 struct CholmodDecompositionVisitor
     : public boost::python::def_visitor<
-          CholmodDecompositionVisitor<CholdmodDerived> > {
+          CholmodDecompositionVisitor<CholdmodDerived>> {
   typedef CholdmodDerived Solver;
 
   template <class PyClass>

include/eigenpy/decompositions/sparse/cholmod/CholmodSimplicialLDLT.hpp

@@ -14,7 +14,7 @@ namespace eigenpy {
 template <typename MatrixType_, int UpLo_ = Eigen::Lower>
 struct CholmodSimplicialLDLTVisitor
     : public boost::python::def_visitor<
-          CholmodSimplicialLDLTVisitor<MatrixType_, UpLo_> > {
+          CholmodSimplicialLDLTVisitor<MatrixType_, UpLo_>> {
   typedef MatrixType_ MatrixType;
   typedef typename MatrixType::Scalar Scalar;
   typedef typename MatrixType::RealScalar RealScalar;

include/eigenpy/decompositions/sparse/cholmod/CholmodSimplicialLLT.hpp

@@ -14,7 +14,7 @@ namespace eigenpy {
 template <typename MatrixType_, int UpLo_ = Eigen::Lower>
 struct CholmodSimplicialLLTVisitor
     : public boost::python::def_visitor<
-          CholmodSimplicialLLTVisitor<MatrixType_, UpLo_> > {
+          CholmodSimplicialLLTVisitor<MatrixType_, UpLo_>> {
   typedef MatrixType_ MatrixType;
   typedef typename MatrixType::Scalar Scalar;
   typedef typename MatrixType::RealScalar RealScalar;

include/eigenpy/decompositions/sparse/cholmod/CholmodSupernodalLLT.hpp

@@ -14,7 +14,7 @@ namespace eigenpy {
 template <typename MatrixType_, int UpLo_ = Eigen::Lower>
 struct CholmodSupernodalLLTVisitor
     : public boost::python::def_visitor<
-          CholmodSupernodalLLTVisitor<MatrixType_, UpLo_> > {
+          CholmodSupernodalLLTVisitor<MatrixType_, UpLo_>> {
   typedef MatrixType_ MatrixType;
   typedef typename MatrixType::Scalar Scalar;
   typedef typename MatrixType::RealScalar RealScalar;

include/eigenpy/details.hpp

@@ -31,8 +31,8 @@ struct expose_eigen_type_impl<MatType, Eigen::MatrixBase<MatType>, Scalar> {
     // to-python
     EigenToPyConverter<MatType>::registration();
 #if EIGEN_VERSION_AT_LEAST(3, 2, 0)
-    EigenToPyConverter<Eigen::Ref<MatType> >::registration();
-    EigenToPyConverter<const Eigen::Ref<const MatType> >::registration();
+    EigenToPyConverter<Eigen::Ref<MatType>>::registration();
+    EigenToPyConverter<const Eigen::Ref<const MatType>>::registration();
 #endif
 
     // from-python
@@ -67,9 +67,9 @@ struct expose_eigen_type_impl<TensorType, Eigen::TensorBase<TensorType>,
 
     // to-python
     EigenToPyConverter<TensorType>::registration();
-    EigenToPyConverter<Eigen::TensorRef<TensorType> >::registration();
+    EigenToPyConverter<Eigen::TensorRef<TensorType>>::registration();
     EigenToPyConverter<
-        const Eigen::TensorRef<const TensorType> >::registration();
+        const Eigen::TensorRef<const TensorType>>::registration();
 
     // from-python
     EigenFromPyConverter<TensorType>::registration();

include/eigenpy/eigen-allocator.hpp

@@ -98,7 +98,7 @@ template <typename EigenType,
 struct check_swap_impl;
 
 template <typename MatType>
-struct check_swap_impl<MatType, Eigen::MatrixBase<MatType> >
+struct check_swap_impl<MatType, Eigen::MatrixBase<MatType>>
     : check_swap_impl_matrix<MatType> {};
 
 template <typename MatType>
@@ -127,7 +127,7 @@ struct check_swap_impl_tensor {
 };
 
 template <typename TensorType>
-struct check_swap_impl<TensorType, Eigen::TensorBase<TensorType> >
+struct check_swap_impl<TensorType, Eigen::TensorBase<TensorType>>
     : check_swap_impl_tensor<TensorType> {};
 #endif
 
@@ -294,11 +294,11 @@ template <typename MatType>
 struct eigen_allocator_impl_matrix;
 
 template <typename MatType>
-struct eigen_allocator_impl<MatType, Eigen::MatrixBase<MatType> >
+struct eigen_allocator_impl<MatType, Eigen::MatrixBase<MatType>>
     : eigen_allocator_impl_matrix<MatType> {};
 
 template <typename MatType>
-struct eigen_allocator_impl<const MatType, const Eigen::MatrixBase<MatType> >
+struct eigen_allocator_impl<const MatType, const Eigen::MatrixBase<MatType>>
     : eigen_allocator_impl_matrix<const MatType> {};
 
 template <typename MatType>
@@ -362,12 +362,12 @@ template <typename TensorType>
 struct eigen_allocator_impl_tensor;
 
 template <typename TensorType>
-struct eigen_allocator_impl<TensorType, Eigen::TensorBase<TensorType> >
+struct eigen_allocator_impl<TensorType, Eigen::TensorBase<TensorType>>
     : eigen_allocator_impl_tensor<TensorType> {};
 
 template <typename TensorType>
 struct eigen_allocator_impl<const TensorType,
-                            const Eigen::TensorBase<TensorType> >
+                            const Eigen::TensorBase<TensorType>>
     : eigen_allocator_impl_tensor<const TensorType> {};
 
 template <typename TensorType>
@@ -462,7 +462,7 @@ inline bool is_arr_layout_compatible_with_mat_type(PyArrayObject *pyArray) {
 }
 
 template <typename MatType, int Options, typename Stride>
-struct eigen_allocator_impl_matrix<Eigen::Ref<MatType, Options, Stride> > {
+struct eigen_allocator_impl_matrix<Eigen::Ref<MatType, Options, Stride>> {
   typedef Eigen::Ref<MatType, Options, Stride> RefType;
   typedef typename MatType::Scalar Scalar;
 
@@ -523,7 +523,7 @@ struct eigen_allocator_impl_matrix<Eigen::Ref<MatType, Options, Stride> > {
 
 template <typename MatType, int Options, typename Stride>
 struct eigen_allocator_impl_matrix<
-    const Eigen::Ref<const MatType, Options, Stride> > {
+    const Eigen::Ref<const MatType, Options, Stride>> {
   typedef const Eigen::Ref<const MatType, Options, Stride> RefType;
   typedef typename MatType::Scalar Scalar;
 
@@ -590,14 +590,14 @@ template <typename TensorType, typename TensorRef>
 struct eigen_allocator_impl_tensor_ref;
 
 template <typename TensorType>
-struct eigen_allocator_impl_tensor<Eigen::TensorRef<TensorType> >
+struct eigen_allocator_impl_tensor<Eigen::TensorRef<TensorType>>
     : eigen_allocator_impl_tensor_ref<TensorType,
-                                      Eigen::TensorRef<TensorType> > {};
+                                      Eigen::TensorRef<TensorType>> {};
 
 template <typename TensorType>
-struct eigen_allocator_impl_tensor<const Eigen::TensorRef<const TensorType> >
+struct eigen_allocator_impl_tensor<const Eigen::TensorRef<const TensorType>>
     : eigen_allocator_impl_tensor_ref<
-          const TensorType, const Eigen::TensorRef<const TensorType> > {};
+          const TensorType, const Eigen::TensorRef<const TensorType>> {};
 
 template <typename TensorType, typename RefType>
 struct eigen_allocator_impl_tensor_ref {