Fix minor warnings (#36)

* Fix warning2 * add missing using to remove ambiguity * update includes with new NG paths * remove useless override
sofa-framework · Aug 17, 2022 · 88cc4e6 · 88cc4e6
1 parent 36fe256
commit 88cc4e6
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 3 deletions.
diff --git a/src/BeamAdapter/component/constraint/AdaptiveBeamLengthConstraint.inl b/src/BeamAdapter/component/constraint/AdaptiveBeamLengthConstraint.inl
@@ -50,9 +50,9 @@ public:
     AdaptiveBeamLengthConstraintResolution(double* initF=nullptr, bool* active=nullptr) : ConstraintResolution(1) ,m_initF(initF), m_active(active)
     {
     }
-    virtual void init(int line, double** w, double* force);
-    virtual void resolution(int line, double** w, double* d, double* force);
-    virtual void store(int line, double* force, bool convergence);
+    void init(int line, double** w, double* force) override;
+    void resolution(int line, double** w, double* d, double* force);
+    void store(int line, double* force, bool convergence) override;
 
 protected:
     double*    m_initF;

diff --git a/src/BeamAdapter/component/constraint/ImplicitSurfaceAdaptiveConstraint.inl b/src/BeamAdapter/component/constraint/ImplicitSurfaceAdaptiveConstraint.inl
@@ -31,6 +31,7 @@
 #include <sofa/core/ConstraintParams.h>
 #include <sofa/component/constraint/lagrangian/model/UnilateralInteractionConstraint.h>
 
+
 double TimeResolution = 0.0;
 double TimeCount = 0.0;
 double TimeProjection = 0.0;

diff --git a/src/BeamAdapter/component/forcefield/AdaptiveBeamForceFieldAndMass.h b/src/BeamAdapter/component/forcefield/AdaptiveBeamForceFieldAndMass.h
@@ -179,6 +179,7 @@ class AdaptiveBeamForceFieldAndMass : public core::behavior::Mass<DataTypes>
         return 0; 
     }
 
+    using sofa::core::behavior::ForceField<DataTypes>::addKToMatrix;
     void addKToMatrix(const MechanicalParams* mparams,
                       const MultiMatrixAccessor* matrix) override;
 

diff --git a/src/BeamAdapter/component/forcefield/AdaptiveInflatableBeamForceField.h b/src/BeamAdapter/component/forcefield/AdaptiveInflatableBeamForceField.h
@@ -219,6 +219,7 @@ class AdaptiveInflatableBeamForceField : public Mass<DataTypes>
         return 0;
     }
 
+    using sofa::core::behavior::ForceField<DataTypes>::addKToMatrix;
     void addKToMatrix(const MechanicalParams* mparams,
                       const MultiMatrixAccessor* matrix) override;