fight warnings c++17, additional corrections

diff --git a/src/GMSHPlugin/GMSHPlugin_Hypothesis.hxx b/src/GMSHPlugin/GMSHPlugin_Hypothesis.hxx
index 90609fc347949584d7e61129d09069bf28f7ae4a..8cc61dc4c1b13771d04d516e12b88c48b44eb8da 100644 (file)
--- a/src/GMSHPlugin/GMSHPlugin_Hypothesis.hxx
+++ b/src/GMSHPlugin/GMSHPlugin_Hypothesis.hxx
@@ -140,13 +140,13 @@ public:
    * \param theShape - the geometry of interest
    * \retval bool - always false
    */
-  virtual bool SetParametersByMesh(const SMESH_Mesh* /*theMesh*/, const TopoDS_Shape& /*theShape*/);
+  virtual bool SetParametersByMesh(const SMESH_Mesh* theMesh, const TopoDS_Shape& theShape);
 
   /*!
    * \brief Initialize my parameter values by default parameters.
    *  \retval bool - true if parameter values have been successfully defined
    */
-  virtual bool SetParametersByDefaults(const TDefaults& /*dflts*/, const SMESH_Mesh* theMesh=0);
+  virtual bool SetParametersByDefaults(const TDefaults& dflts, const SMESH_Mesh* theMesh=0);
 
 private:
   Algo2D        _algo2d;

diff --git a/src/GMSHPlugin/GMSHPlugin_Hypothesis_i.hxx b/src/GMSHPlugin/GMSHPlugin_Hypothesis_i.hxx
index 79d1831168f730aaac27780e6108f4da17a4f7c6..f9b79a123851fd3bce11e05a638d43456b05e1a2 100644 (file)
--- a/src/GMSHPlugin/GMSHPlugin_Hypothesis_i.hxx
+++ b/src/GMSHPlugin/GMSHPlugin_Hypothesis_i.hxx
@@ -170,11 +170,11 @@ class GMSHPLUGIN_EXPORT GMSHPlugin_Hypothesis_i:
 
   // Return geometry this hypothesis depends on. Return false if there is no geometry parameter
   virtual bool getObjectsDependOn( std::vector< std::string > & entryArray,
-                                   std::vector< int >         & /*subIDArray*/ ) const;
+                                   std::vector< int >         & subIDArray ) const;
 
   // Set new geometry instead of that returned by getObjectsDependOn()
   virtual bool setObjectsDependOn( std::vector< std::string > & entryArray,
-                                   std::vector< int >         & /*subIDArray*/ );
+                                   std::vector< int >         & subIDArray );
 };
 
 #endif

diff --git a/src/GMSHPlugin/GMSHPlugin_i.cxx b/src/GMSHPlugin/GMSHPlugin_i.cxx
index 41780fd38b7ff4a3de96205664f060543eff6575..e3ac90cc1c8f96db948cf49da5af3edf91074ab8 100644 (file)
--- a/src/GMSHPlugin/GMSHPlugin_i.cxx
+++ b/src/GMSHPlugin/GMSHPlugin_i.cxx
@@ -58,7 +58,6 @@ extern "C"
       aCreator = new GMSHPlugin_Creator_i<GMSHPlugin_Hypothesis_i>;
     else if (strcmp(aHypName, "GMSH_Parameters_2D") == 0)
       aCreator = new GMSHPlugin_Creator_i<GMSHPlugin_Hypothesis_2D_i>;
-    else ;
 
     return aCreator;
   }