[kernel/mechanics] add missing non-virtual destructor

siconos · Mar 7, 2016 · 15102fc · 15102fc
1 parent 20ba10b
commit 15102fc
Show file tree

Hide file tree

Showing 7 changed files with 12 additions and 7 deletions.
diff --git a/cmake/CXXCompilerSetup.cmake b/cmake/CXXCompilerSetup.cmake
@@ -86,6 +86,7 @@ if(DEV_MODE)
   add_cxx_options("-Wformat=2")
   add_cxx_options("-Werror=format-security")
 
+  add_cxx_options("-Werror=non-virtual-dtor")
 endif()
 
 # add_cxx_options("-static -static-libgcc -static-libstdc++" "GNU;Clang")

diff --git a/kernel/src/simulationTools/ExtraAdditionalTerms.hpp b/kernel/src/simulationTools/ExtraAdditionalTerms.hpp
@@ -57,7 +57,8 @@ struct ExtraAdditionalTerms {
    */
   virtual void addJacobianRhsContribution(DynamicalSystemsGraph& DSG0, const DynamicalSystemsGraph::VDescriptor& dsgVD, const double h, SiconosMatrix& jacRhs) = 0;
 
-
+  /** Desctructor */
+  virtual ~ExtraAdditionalTerms() {};
 };
 
 #endif
diff --git a/kernel/src/utils/SiconosTools/test/SiconosVisitorTest.cpp b/kernel/src/utils/SiconosTools/test/SiconosVisitorTest.cpp
@@ -119,6 +119,8 @@ struct Object {
 
   VIRTUAL_ACCEPT_VISITORS();
 
+  virtual ~Object() {};
+
 };
 
 struct ObjectA : public Object
@@ -127,6 +129,8 @@ struct ObjectA : public Object
   int dummya;
 
   ACCEPT_STD_VISITORS();
+  virtual ~ObjectA() {};
+
 };
 
 struct ObjectB : public Object
@@ -135,6 +139,8 @@ struct ObjectB : public Object
   int dummyb;
 
   ACCEPT_STD_VISITORS();
+  virtual ~ObjectB() {};
+
 };
 
 #define VISITOR_CLASSES()\

diff --git a/mechanics/src/bodies/Circle.hpp b/mechanics/src/bodies/Circle.hpp
@@ -57,7 +57,7 @@ class Circle : public CircularDS, public std11::enable_shared_from_this<Circle>
 
   /** destructor
    */
-  ~Circle();
+  virtual ~Circle();
 
   /** visitors hook */
   ACCEPT_BASE_SP_VISITORS(LagrangianDS);

diff --git a/mechanics/src/bodies/CircularDS.cpp b/mechanics/src/bodies/CircularDS.cpp
@@ -28,6 +28,3 @@ CircularDS::CircularDS(double r, double m,
 {
   _ndof = 3;
 }
-
-CircularDS::~CircularDS()
-{}
diff --git a/mechanics/src/bodies/CircularDS.hpp b/mechanics/src/bodies/CircularDS.hpp
@@ -47,7 +47,7 @@ class CircularDS : public LagrangianDS
 
   CircularDS(double, double, SP::SiconosVector, SP::SiconosVector);
 
-  ~CircularDS();
+  virtual ~CircularDS() {};
 
   inline double getQ(unsigned int pos)
   {

diff --git a/mechanics/src/bodies/Disk.hpp b/mechanics/src/bodies/Disk.hpp
@@ -56,7 +56,7 @@ class Disk : public CircularDS, public std11::enable_shared_from_this<Disk>
 
   /** destructor
    */
-  ~Disk();
+  virtual ~Disk();
 
 
   /** visitors hook