From 0c0965b78e6cb05d45bf821ed65a1291068cfe6e Mon Sep 17 00:00:00 2001 From: vsr Date: Tue, 27 Oct 2020 12:01:04 +0300 Subject: [PATCH] fight warnings c++17, additional corrections --- src/GMSHPlugin/GMSHPlugin_Hypothesis.hxx | 4 ++-- src/GMSHPlugin/GMSHPlugin_Hypothesis_i.hxx | 4 ++-- src/GMSHPlugin/GMSHPlugin_i.cxx | 1 - 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/src/GMSHPlugin/GMSHPlugin_Hypothesis.hxx b/src/GMSHPlugin/GMSHPlugin_Hypothesis.hxx index 90609fc..8cc61dc 100644 --- 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 79d1831..f9b79a1 100644 --- 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 41780fd..e3ac90c 100644 --- a/src/GMSHPlugin/GMSHPlugin_i.cxx +++ b/src/GMSHPlugin/GMSHPlugin_i.cxx @@ -58,7 +58,6 @@ extern "C" aCreator = new GMSHPlugin_Creator_i; else if (strcmp(aHypName, "GMSH_Parameters_2D") == 0) aCreator = new GMSHPlugin_Creator_i; - else ; return aCreator; } -- 2.39.2