diff --git a/Sofa/Component/Collision/Detection/Intersection/tests/LocalMinDistance_test.cpp b/Sofa/Component/Collision/Detection/Intersection/tests/LocalMinDistance_test.cpp index 5cd04385955..cce7a418f11 100644 --- a/Sofa/Component/Collision/Detection/Intersection/tests/LocalMinDistance_test.cpp +++ b/Sofa/Component/Collision/Detection/Intersection/tests/LocalMinDistance_test.cpp @@ -54,11 +54,11 @@ namespace { struct TestLocalMinDistance : public BaseSimulationTest { - void SetUp() + void SetUp() override { sofa::simpleapi::importPlugin("Sofa.Component.StateContainer"); } - void TearDown() + void TearDown() override { } diff --git a/Sofa/Component/SolidMechanics/simutests/AffinePatch_test.cpp b/Sofa/Component/SolidMechanics/simutests/AffinePatch_test.cpp index b0779c4062b..d33a992eac1 100644 --- a/Sofa/Component/SolidMechanics/simutests/AffinePatch_test.cpp +++ b/Sofa/Component/SolidMechanics/simutests/AffinePatch_test.cpp @@ -80,7 +80,7 @@ struct AffinePatch_sofa_test : public sofa::testing::BaseSimulationTest, sofa::t Coord testedTranslation; /// Create the context for the scene - void SetUp() + void SetUp() override { // Init simulation simulation = sofa::simulation::getSimulation(); diff --git a/Sofa/Component/SolidMechanics/simutests/LinearElasticity_test.cpp b/Sofa/Component/SolidMechanics/simutests/LinearElasticity_test.cpp index b9d34e25cc2..5709d9dfbba 100644 --- a/Sofa/Component/SolidMechanics/simutests/LinearElasticity_test.cpp +++ b/Sofa/Component/SolidMechanics/simutests/LinearElasticity_test.cpp @@ -196,7 +196,7 @@ struct LinearElasticity_test : public sofa::testing::BaseSimulationTest, sofa::t // Create the context for the scene - void SetUp() + void SetUp() override { // Init simulation simulation = sofa::simulation::getSimulation(); @@ -281,7 +281,7 @@ struct LinearElasticity_test : public sofa::testing::BaseSimulationTest, sofa::t } return true; } - void TearDown() + void TearDown() override { if (tractionStruct.root!=nullptr) sofa::simulation::node::unload(tractionStruct.root); diff --git a/Sofa/GL/src/sofa/gl/GLSLShader.cpp b/Sofa/GL/src/sofa/gl/GLSLShader.cpp index 37e14786cbf..aa1b1e5272d 100644 --- a/Sofa/GL/src/sofa/gl/GLSLShader.cpp +++ b/Sofa/GL/src/sofa/gl/GLSLShader.cpp @@ -43,7 +43,8 @@ class GLSLFileListener : public helper::system::FileEventListener } /// Inherited from FileEventListener - void fileHasChanged(const std::string& filename){ + void fileHasChanged(const std::string& filename) override + { /// We are recompiling & re-initializing all the shaders... /// If this become a bottleneck we can do finer grain updates to /// speed up the thing. diff --git a/Sofa/framework/Simulation/Graph/test/Simulation_test.cpp b/Sofa/framework/Simulation/Graph/test/Simulation_test.cpp index b8648319f70..a8ab5d8040c 100644 --- a/Sofa/framework/Simulation/Graph/test/Simulation_test.cpp +++ b/Sofa/framework/Simulation/Graph/test/Simulation_test.cpp @@ -46,7 +46,7 @@ template struct InstrumentedObject : public Object { InstrumentedObject() { objectCounter++; } - ~InstrumentedObject() { objectCounter--; } + ~InstrumentedObject() override { objectCounter--; } }; /// Component with a sub-component