Resolve remaining bugs related to SoftRobot plugin compilation issues.

SofaDefrost · Aug 22, 2024 · 64467b2 · 64467b2
1 parent dd6da7d
commit 64467b2
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/src/Cosserat/constraint/CosseratActuatorConstraint.h b/src/Cosserat/constraint/CosseratActuatorConstraint.h
@@ -47,6 +47,7 @@ using sofa::core::ConstraintParams;
 using sofa::linearalgebra::BaseVector;
 using sofa::core::visual::VisualParams ;
 using sofa::core::behavior::ConstraintResolution;
+using softrobots::constraint::CableModel;
 
 
 class MyCableForceConstraintResolution : public ConstraintResolution
@@ -114,7 +115,7 @@ class MyCableForceConstraintResolution : public ConstraintResolution
  *
 */
 template< class DataTypes >
-class CosseratActuatorConstraint : public softrobots::constraint::CableModel<DataTypes>
+class CosseratActuatorConstraint : public CableModel<DataTypes>
 {
 public:
     SOFA_CLASS(SOFA_TEMPLATE(CosseratActuatorConstraint,DataTypes), SOFA_TEMPLATE(CableModel,DataTypes));

diff --git a/src/Cosserat/constraint/QPSlidingConstraint.h b/src/Cosserat/constraint/QPSlidingConstraint.h
@@ -48,6 +48,7 @@ using sofa::linearalgebra::BaseVector ;
 using sofa::core::ConstraintParams ;
 using sofa::helper::ReadAccessor ;
 using sofa::core::VecCoordId ;
+using softrobots::constraint::CableModel;
 
 using sofa::core::behavior::ConstraintResolution ;
 //using sofa::component::constraint::lagrangian::model::ConstraintResolution;
@@ -145,7 +146,7 @@ class QPSlidingConstraint : public softrobots::constraint::CableModel<DataTypes>
     /// Bring m_state in the current lookup context.
     /// otherwise any access to the base::attribute would require
     /// using the "this->" approach.
-    using SoftRobotsConstraint<DataTypes>::m_state ;
+    using softrobots::constraint::SoftRobotsConstraint<DataTypes>::m_state ;
     ////////////////////////// Inherited attributes ////////////////////////////
     /// https://gcc.gnu.org/onlinedocs/gcc/Name-lookup.html
     /// Bring inherited attributes and function in the current lookup context.
@@ -160,8 +161,8 @@ class QPSlidingConstraint : public softrobots::constraint::CableModel<DataTypes>
     using CableModel<DataTypes>::d_componentState ;
     ////////////////////////////////////////////////////////////////////////////
     /// \brief internalInit
-    using SoftRobotsConstraint<DataTypes>::m_nbLines ;
-    using SoftRobotsConstraint<DataTypes>::m_constraintIndex ;
+    using softrobots::constraint::SoftRobotsConstraint<DataTypes>::m_nbLines ;
+    using softrobots::constraint::SoftRobotsConstraint<DataTypes>::m_constraintIndex ;
 
     void internalInit();
 };