Fix compilation

bakpaul · Jan 23, 2025 · 5e455e4 · 5e455e4
1 parent 21a6198
commit 5e455e4
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/...nent/SolidMechanics/Spring/src/sofa/component/solidmechanics/spring/FixedWeakConstraint.h b/...nent/SolidMechanics/Spring/src/sofa/component/solidmechanics/spring/FixedWeakConstraint.h
@@ -29,7 +29,7 @@
 #include <sofa/core/topology/TopologySubsetIndices.h>
 #include <sofa/type/vector.h>
 #include <sofa/linearalgebra/EigenSparseMatrix.h>
-#include <sofa/core/objectmodel/RenamedData.h>
+#include <sofa/core/objectmodel/lifecycle/RenamedData.h>
 
 
 namespace sofa::core::behavior

diff --git a/...nt/SolidMechanics/Spring/src/sofa/component/solidmechanics/spring/FixedWeakConstraint.inl b/...nt/SolidMechanics/Spring/src/sofa/component/solidmechanics/spring/FixedWeakConstraint.inl
@@ -108,7 +108,7 @@ const bool  FixedWeakConstraint<DataTypes>::checkState()
     /// Compile time condition to check if we are working with a Rigid3Types or a type that does not
     /// need the Angular Stiffness parameters.
     //if constexpr (isRigid())
-    if constexpr (sofa::type::isRigidType<DataTypes>())
+    if constexpr (sofa::type::isRigidType<DataTypes>)
     {
         sofa::helper::ReadAccessor<Data<VecReal>> s = d_stiffness;
         sofa::helper::WriteOnlyAccessor<Data<VecReal>> as = d_angularStiffness;
@@ -274,7 +274,7 @@ void FixedWeakConstraint<DataTypes>::addForce(const MechanicalParams*  mparams ,
         const auto & activeDirections = getActiveDirections();
 
         // rigid case
-        if constexpr (sofa::type::isRigidType<DataTypes>())
+        if constexpr (sofa::type::isRigidType<DataTypes>)
         {
 
             CPos dx = p1[index].getCenter() - p0[ext_index].getCenter();
@@ -362,7 +362,7 @@ void FixedWeakConstraint<DataTypes>::addDForce(const MechanicalParams* mparams,
 
         const auto stiffness = k[static_cast<std::size_t>(i < k.size()) * i];
 
-        if constexpr (sofa::type::isRigidType<DataTypes>())
+        if constexpr (sofa::type::isRigidType<DataTypes>)
         {
             const auto angularStiffness = k_a[static_cast<std::size_t>(i < k_a.size()) * i];
 
@@ -458,7 +458,7 @@ void FixedWeakConstraint<DataTypes>::addKToMatrix(const MechanicalParams* mparam
         }
 
         // rotation (if applicable)
-        if constexpr (sofa::type::isRigidType<DataTypes>())
+        if constexpr (sofa::type::isRigidType<DataTypes>)
         {
             const auto vr = -kFact * k_a[(index < k_a.size()) * index];
             for (sofa::Size i = space_size; i < total_size; i++)
@@ -507,7 +507,7 @@ void FixedWeakConstraint<DataTypes>::buildStiffnessMatrix(core::behavior::Stiffn
         }
 
         // rotation (if applicable)
-        if constexpr (sofa::type::isRigidType<DataTypes>())
+        if constexpr (sofa::type::isRigidType<DataTypes>)
         {
             const auto vr = -k_a[(index < k_a.size()) * index];
             for (sofa::Size i = space_size; i < total_size; ++i)