From 88cc4e640185e82c817fcacd6a4a97cb7a9e4488 Mon Sep 17 00:00:00 2001
From: Hugo <hugo.talbot@sofa-framework.org>
Date: Wed, 17 Aug 2022 02:44:01 +0200
Subject: [PATCH] Fix minor warnings  (#36)

* Fix warning2

* add missing using to remove ambiguity

* update includes with new NG paths

* remove useless override
---
 .../component/constraint/AdaptiveBeamLengthConstraint.inl   | 6 +++---
 .../constraint/ImplicitSurfaceAdaptiveConstraint.inl        | 1 +
 .../component/forcefield/AdaptiveBeamForceFieldAndMass.h    | 1 +
 .../component/forcefield/AdaptiveInflatableBeamForceField.h | 1 +
 4 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/BeamAdapter/component/constraint/AdaptiveBeamLengthConstraint.inl b/src/BeamAdapter/component/constraint/AdaptiveBeamLengthConstraint.inl
index aeff9e3d9..b376f0a24 100644
--- 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
index 1435a3196..96a305ee3 100644
--- 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
index 984d8ff37..7575d78d4 100644
--- 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
index a6d41ccf6..4b6a48fd6 100644
--- 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;