Fix compilation after rename

SofaDefrost · Sep 2, 2024 · 88316a4 · 88316a4
1 parent 36d90df
commit 88316a4
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 9 deletions.
diff --git a/src/Cosserat/constraint/CosseratActuatorConstraint.h b/src/Cosserat/constraint/CosseratActuatorConstraint.h
@@ -175,7 +175,7 @@ class CosseratActuatorConstraint : public CableModel<DataTypes>
     using CableModel<DataTypes>::d_displacement ;
     using CableModel<DataTypes>::d_componentState ;
     using CableModel<DataTypes>::m_nbLines ;
-    using CableModel<DataTypes>::m_constraintIndex ;
+    using CableModel<DataTypes>::d_constraintIndex ;
     using CableModel<DataTypes>::m_state ;
     using CableModel<DataTypes>::d_indices ;
     using CableModel<DataTypes>::d_pullPoint;

diff --git a/src/Cosserat/constraint/CosseratActuatorConstraint.inl b/src/Cosserat/constraint/CosseratActuatorConstraint.inl
@@ -104,8 +104,8 @@ void CosseratActuatorConstraint<DataTypes>::buildConstraintMatrix(const Constrai
 
     SOFA_UNUSED(cParams);
 
-    m_constraintIndex.setValue(cIndex);
-    const auto& constraintIndex = sofa::helper::getReadAccessor(m_constraintIndex);
+    d_constraintIndex.setValue(cIndex);
+    const auto& constraintIndex = sofa::helper::getReadAccessor(d_constraintIndex);
 
     MatrixDeriv& matrix = *cMatrix.beginEdit();
 

diff --git a/src/Cosserat/constraint/CosseratNeedleSlidingConstraint.h b/src/Cosserat/constraint/CosseratNeedleSlidingConstraint.h
@@ -136,7 +136,7 @@ namespace sofa::component::constraintset
         ////////////////////////////////////////////////////////////////////////////
         /// \brief internalInit
         unsigned m_nbLines ;
-        using Constraint<DataTypes>::m_constraintIndex ;
+        using Constraint<DataTypes>::d_constraintIndex ;
 
         void internalInit();
     };

diff --git a/src/Cosserat/constraint/CosseratNeedleSlidingConstraint.inl b/src/Cosserat/constraint/CosseratNeedleSlidingConstraint.inl
@@ -151,7 +151,7 @@ namespace sofa::component::constraintset
     //ReadAccessor<Data<VecCoord>> positions = this->mstate->readPositions();
     const VecCoord positions = x.getValue();
     type::Vec<3, bool> use = d_useDirections.getValue();
-    const auto& constraintIndex = sofa::helper::getReadAccessor(m_constraintIndex);
+    const auto& constraintIndex = sofa::helper::getReadAccessor(d_constraintIndex);
 
     for (unsigned int i = 0; i < positions.size(); i++)
     {

diff --git a/src/Cosserat/constraint/QPSlidingConstraint.h b/src/Cosserat/constraint/QPSlidingConstraint.h
@@ -162,7 +162,7 @@ class QPSlidingConstraint : public softrobots::constraint::CableModel<DataTypes>
     ////////////////////////////////////////////////////////////////////////////
     /// \brief internalInit
     using softrobots::constraint::SoftRobotsConstraint<DataTypes>::m_nbLines ;
-    using softrobots::constraint::SoftRobotsConstraint<DataTypes>::m_constraintIndex ;
+    using softrobots::constraint::SoftRobotsConstraint<DataTypes>::d_constraintIndex ;
 
     void internalInit();
 };

diff --git a/src/Cosserat/constraint/QPSlidingConstraint.inl b/src/Cosserat/constraint/QPSlidingConstraint.inl
@@ -118,8 +118,8 @@ void QPSlidingConstraint<DataTypes>::buildConstraintMatrix(const ConstraintParam
     SOFA_UNUSED(cParams);
     MatrixDeriv& matrix = *cMatrix.beginEdit();
     VecCoord positions = x.getValue();
-    m_constraintIndex.setValue(cIndex);
-    const auto& constraintIndex = sofa::helper::getReadAccessor(m_constraintIndex);
+    d_constraintIndex.setValue(cIndex);
+    const auto& constraintIndex = sofa::helper::getReadAccessor(d_constraintIndex);
 
     for (unsigned int i=0; i<positions.size(); i++)
     {
@@ -156,7 +156,7 @@ void QPSlidingConstraint<DataTypes>::getConstraintViolation(const ConstraintPara
 
     SOFA_UNUSED(cParams);
     ReadAccessor<Data<VecCoord>> positions = m_state->readPositions();
-    const auto& constraintIndex = sofa::helper::getReadAccessor(m_constraintIndex);
+    const auto& constraintIndex = sofa::helper::getReadAccessor(d_constraintIndex);
 
     if(Jdx->size()==0){
         //std::cout << "Size JDX = "<< Jdx->size() << std::endl;