[all] Virtual inheritance of SingleStateAccessor

Sofa/Component/Engine/Analyze/src/sofa/component/engine/analyze/AverageCoord.h

@@ -38,7 +38,7 @@ namespace sofa::component::engine::analyze
  * This class computes the average of a set of Coordinates
  */
 template <class DataTypes>
-class AverageCoord : public core::DataEngine, public core::behavior::SingleStateAccessor<DataTypes>
+class AverageCoord : public core::DataEngine, public virtual core::behavior::SingleStateAccessor<DataTypes>
 {
 public:
     SOFA_CLASS(SOFA_TEMPLATE(AverageCoord,DataTypes),core::DataEngine);

Sofa/Component/Engine/Analyze/src/sofa/component/engine/analyze/ShapeMatching.h

@@ -41,7 +41,7 @@ namespace sofa::component::engine::analyze
  * This class computes target positions using shape matching deformation [Muller05][Muller11]
  */
 template <class DataTypes>
-class ShapeMatching : public core::DataEngine, public core::behavior::SingleStateAccessor<DataTypes>
+class ShapeMatching : public core::DataEngine, public virtual core::behavior::SingleStateAccessor<DataTypes>
 {
 public:
     SOFA_CLASS(SOFA_TEMPLATE(ShapeMatching,DataTypes),core::DataEngine);

Sofa/framework/Core/src/sofa/core/behavior/ConstraintCorrection.h

@@ -33,7 +33,7 @@ namespace sofa::core::behavior
  * Component computing constraint forces within a simulated body using the compliance method.
  */
 template<class TDataTypes>
-class ConstraintCorrection : public BaseConstraintCorrection, public SingleStateAccessor<TDataTypes>
+class ConstraintCorrection : public BaseConstraintCorrection, public virtual SingleStateAccessor<TDataTypes>
 {
 public:
     SOFA_ABSTRACT_CLASS2(SOFA_TEMPLATE(ConstraintCorrection, TDataTypes),

Sofa/framework/Core/src/sofa/core/behavior/ForceField.h

@@ -42,7 +42,7 @@ namespace sofa::core::behavior
  *  ( df, given a displacement dx ).
  */
 template<class TDataTypes>
-class ForceField : public BaseForceField, public SingleStateAccessor<TDataTypes>
+class ForceField : public BaseForceField, public virtual SingleStateAccessor<TDataTypes>
 {
 public:
     SOFA_CLASS2(SOFA_TEMPLATE(ForceField, TDataTypes), BaseForceField, SOFA_TEMPLATE(SingleStateAccessor, TDataTypes));

Sofa/framework/Core/src/sofa/core/behavior/LagrangianConstraint.h

@@ -41,7 +41,7 @@ namespace sofa::core::behavior
  *
  */
 template<class DataTypes>
-class LagrangianConstraint : public BaseLagrangianConstraint, public SingleStateAccessor<DataTypes>
+class LagrangianConstraint : public BaseLagrangianConstraint, public virtual SingleStateAccessor<DataTypes>
 {
 public:
     SOFA_CLASS2(SOFA_TEMPLATE(LagrangianConstraint, DataTypes), BaseLagrangianConstraint, SOFA_TEMPLATE(SingleStateAccessor, DataTypes));

Sofa/framework/Core/src/sofa/core/behavior/ProjectiveConstraintSet.h

@@ -39,7 +39,7 @@ namespace sofa::core::behavior
  *
  */
 template<class DataTypes>
-class ProjectiveConstraintSet : public BaseProjectiveConstraintSet, public SingleStateAccessor<DataTypes>
+class ProjectiveConstraintSet : public BaseProjectiveConstraintSet, public virtual SingleStateAccessor<DataTypes>
 {
 public:
     SOFA_CLASS2(SOFA_TEMPLATE(ProjectiveConstraintSet,DataTypes), BaseProjectiveConstraintSet, SOFA_TEMPLATE(SingleStateAccessor, DataTypes));