From a7f81ddd3984f7adbc546790093f86df53b2a154 Mon Sep 17 00:00:00 2001 From: SALOME Date: Wed, 26 Aug 2020 08:59:41 +0300 Subject: [PATCH] fight warnings c++17, fix minor warnings. Build NETGENPLUGIN finished --- src/GUI/NETGENPluginGUI_HypothesisCreator.cxx | 2 +- src/GUI/NETGENPluginGUI_HypothesisCreator.h | 2 +- src/NETGENPlugin/NETGENPlugin_Hypothesis.cxx | 4 ++-- src/NETGENPlugin/NETGENPlugin_Hypothesis.hxx | 2 +- src/NETGENPlugin/NETGENPlugin_Hypothesis_i.cxx | 4 ++-- src/NETGENPlugin/NETGENPlugin_Hypothesis_i.hxx | 4 ++-- src/NETGENPlugin/NETGENPlugin_Mesher.cxx | 4 ++-- src/NETGENPlugin/NETGENPlugin_Mesher.hxx | 2 +- src/NETGENPlugin/NETGENPlugin_Remesher_2D.cxx | 10 +++++----- src/NETGENPlugin/NETGENPlugin_Remesher_2D.hxx | 8 ++++---- .../NETGENPlugin_SimpleHypothesis_2D_i.cxx | 2 +- .../NETGENPlugin_SimpleHypothesis_2D_i.hxx | 10 +++++----- .../NETGENPlugin_SimpleHypothesis_3D_i.hxx | 8 ++++---- 13 files changed, 31 insertions(+), 31 deletions(-) diff --git a/src/GUI/NETGENPluginGUI_HypothesisCreator.cxx b/src/GUI/NETGENPluginGUI_HypothesisCreator.cxx index 2fa8a99..08f5962 100644 --- a/src/GUI/NETGENPluginGUI_HypothesisCreator.cxx +++ b/src/GUI/NETGENPluginGUI_HypothesisCreator.cxx @@ -116,7 +116,7 @@ NETGENPluginGUI_HypothesisCreator::~NETGENPluginGUI_HypothesisCreator() { } -bool NETGENPluginGUI_HypothesisCreator::checkParams(QString& msg) const +bool NETGENPluginGUI_HypothesisCreator::checkParams(QString& /*msg*/) const { NetgenHypothesisData data_old, data_new; readParamsFromHypo( data_old ); diff --git a/src/GUI/NETGENPluginGUI_HypothesisCreator.h b/src/GUI/NETGENPluginGUI_HypothesisCreator.h index 4846172..89004b8 100644 --- a/src/GUI/NETGENPluginGUI_HypothesisCreator.h +++ b/src/GUI/NETGENPluginGUI_HypothesisCreator.h @@ -63,7 +63,7 @@ public: NETGENPluginGUI_HypothesisCreator( const QString& ); virtual ~NETGENPluginGUI_HypothesisCreator(); - virtual bool checkParams(QString& msg) const; + virtual bool checkParams(QString& /*msg*/) const; virtual QString helpPage() const; protected: diff --git a/src/NETGENPlugin/NETGENPlugin_Hypothesis.cxx b/src/NETGENPlugin/NETGENPlugin_Hypothesis.cxx index 2eabac4..8c58e3b 100644 --- a/src/NETGENPlugin/NETGENPlugin_Hypothesis.cxx +++ b/src/NETGENPlugin/NETGENPlugin_Hypothesis.cxx @@ -642,8 +642,8 @@ istream & NETGENPlugin_Hypothesis::LoadFrom(istream & load) * \retval bool - always false */ //================================================================================ -bool NETGENPlugin_Hypothesis::SetParametersByMesh(const SMESH_Mesh* theMesh, - const TopoDS_Shape& theShape) +bool NETGENPlugin_Hypothesis::SetParametersByMesh(const SMESH_Mesh* /*theMesh*/, + const TopoDS_Shape& /*theShape*/) { return false; } diff --git a/src/NETGENPlugin/NETGENPlugin_Hypothesis.hxx b/src/NETGENPlugin/NETGENPlugin_Hypothesis.hxx index 37009f6..7b8afae 100644 --- a/src/NETGENPlugin/NETGENPlugin_Hypothesis.hxx +++ b/src/NETGENPlugin/NETGENPlugin_Hypothesis.hxx @@ -156,7 +156,7 @@ 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. diff --git a/src/NETGENPlugin/NETGENPlugin_Hypothesis_i.cxx b/src/NETGENPlugin/NETGENPlugin_Hypothesis_i.cxx index 367cb6d..fa4b04c 100644 --- a/src/NETGENPlugin/NETGENPlugin_Hypothesis_i.cxx +++ b/src/NETGENPlugin/NETGENPlugin_Hypothesis_i.cxx @@ -711,7 +711,7 @@ std::string NETGENPlugin_Hypothesis_i::getMethodOfParameter(const int paramIndex bool NETGENPlugin_Hypothesis_i::getObjectsDependOn( std::vector< std::string > & entryArray, - std::vector< int > & subIDArray ) const + std::vector< int > & /*subIDArray*/ ) const { typedef ::NETGENPlugin_Hypothesis THyp; @@ -733,7 +733,7 @@ NETGENPlugin_Hypothesis_i::getObjectsDependOn( std::vector< std::string > & entr bool NETGENPlugin_Hypothesis_i::setObjectsDependOn( std::vector< std::string > & entryArray, - std::vector< int > & subIDArray ) + std::vector< int > & /*subIDArray*/ ) { typedef ::NETGENPlugin_Hypothesis THyp; diff --git a/src/NETGENPlugin/NETGENPlugin_Hypothesis_i.hxx b/src/NETGENPlugin/NETGENPlugin_Hypothesis_i.hxx index e38b809..614bf6e 100644 --- a/src/NETGENPlugin/NETGENPlugin_Hypothesis_i.hxx +++ b/src/NETGENPlugin/NETGENPlugin_Hypothesis_i.hxx @@ -133,11 +133,11 @@ class NETGENPLUGIN_EXPORT NETGENPlugin_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*/ ); protected: diff --git a/src/NETGENPlugin/NETGENPlugin_Mesher.cxx b/src/NETGENPlugin/NETGENPlugin_Mesher.cxx index 8caf0bf..48d6383 100644 --- a/src/NETGENPlugin/NETGENPlugin_Mesher.cxx +++ b/src/NETGENPlugin/NETGENPlugin_Mesher.cxx @@ -205,7 +205,7 @@ namespace list< TopoDS_Edge > getConnectedEdges( const TopoDS_Edge& edge, const TopoDS_Face& face, - const set< SMESH_subMesh* > & computedSM, + const set< SMESH_subMesh* > & /*computedSM*/, const SMESH_MesherHelper& helper, map< SMESH_subMesh*, set< int > >& addedEdgeSM2Faces) { @@ -3712,7 +3712,7 @@ bool NETGENPlugin_Mesher::Evaluate(MapShapeNbElems& aResMap) return true; } -double NETGENPlugin_Mesher::GetProgress(const SMESH_Algo* holder, +double NETGENPlugin_Mesher::GetProgress(const SMESH_Algo* /*holder*/, const int * algoProgressTic, const double * algoProgress) const { diff --git a/src/NETGENPlugin/NETGENPlugin_Mesher.hxx b/src/NETGENPlugin/NETGENPlugin_Mesher.hxx index 9299dca..1d4e62b 100644 --- a/src/NETGENPlugin/NETGENPlugin_Mesher.hxx +++ b/src/NETGENPlugin/NETGENPlugin_Mesher.hxx @@ -132,7 +132,7 @@ class NETGENPLUGIN_EXPORT NETGENPlugin_Mesher bool Evaluate(MapShapeNbElems& aResMap); - double GetProgress(const SMESH_Algo* holder, + double GetProgress(const SMESH_Algo* /*holder*/, const int * algoProgressTic, const double * algoProgress) const; diff --git a/src/NETGENPlugin/NETGENPlugin_Remesher_2D.cxx b/src/NETGENPlugin/NETGENPlugin_Remesher_2D.cxx index c51e06f..6c662b3 100644 --- a/src/NETGENPlugin/NETGENPlugin_Remesher_2D.cxx +++ b/src/NETGENPlugin/NETGENPlugin_Remesher_2D.cxx @@ -852,8 +852,8 @@ bool NETGENPlugin_Remesher_2D::Compute(SMESH_Mesh& theMesh, */ //============================================================================= -bool NETGENPlugin_Remesher_2D::Compute(SMESH_Mesh& theMesh, - const TopoDS_Shape& theShape) +bool NETGENPlugin_Remesher_2D::Compute(SMESH_Mesh& /*theMesh*/, + const TopoDS_Shape& /*theShape*/) { return false; } @@ -887,9 +887,9 @@ double NETGENPlugin_Remesher_2D::GetProgress() const */ //============================================================================= -bool NETGENPlugin_Remesher_2D::Evaluate(SMESH_Mesh& aMesh, - const TopoDS_Shape& aShape, - MapShapeNbElems& aResMap) +bool NETGENPlugin_Remesher_2D::Evaluate(SMESH_Mesh& /*aMesh*/, + const TopoDS_Shape& /*aShape*/, + MapShapeNbElems& /*aResMap*/) { return false; } diff --git a/src/NETGENPlugin/NETGENPlugin_Remesher_2D.hxx b/src/NETGENPlugin/NETGENPlugin_Remesher_2D.hxx index b1fad2a..3cb6f57 100644 --- a/src/NETGENPlugin/NETGENPlugin_Remesher_2D.hxx +++ b/src/NETGENPlugin/NETGENPlugin_Remesher_2D.hxx @@ -43,16 +43,16 @@ class NETGENPLUGIN_EXPORT NETGENPlugin_Remesher_2D: public SMESH_2D_Algo virtual bool Compute(SMESH_Mesh & theMesh, SMESH_MesherHelper* theHelper); - virtual bool Compute(SMESH_Mesh& theMesh, const TopoDS_Shape& theShape); + virtual bool Compute(SMESH_Mesh& /*theMesh*/, const TopoDS_Shape& /*theShape*/); virtual void CancelCompute(); virtual double GetProgress() const; - virtual bool Evaluate(SMESH_Mesh& theMesh, - const TopoDS_Shape& theShape, - MapShapeNbElems& theResMap); + virtual bool Evaluate(SMESH_Mesh& /*theMesh*/, + const TopoDS_Shape& /*theShape*/, + MapShapeNbElems& /*theResMap*/); protected: diff --git a/src/NETGENPlugin/NETGENPlugin_SimpleHypothesis_2D_i.cxx b/src/NETGENPlugin/NETGENPlugin_SimpleHypothesis_2D_i.cxx index aa57fbf..dbd3b98 100644 --- a/src/NETGENPlugin/NETGENPlugin_SimpleHypothesis_2D_i.cxx +++ b/src/NETGENPlugin/NETGENPlugin_SimpleHypothesis_2D_i.cxx @@ -236,7 +236,7 @@ int NETGENPlugin_SimpleHypothesis_2D_i::getParamIndex(const TCollection_AsciiStr //================================================================================ std::string NETGENPlugin_SimpleHypothesis_2D_i::getMethodOfParameter(const int paramIndex, - int nbVars) const + int /*nbVars*/) const { switch ( paramIndex ) { case 0: return GetImpl()->GetNumberOfSegments() ? "SetNumberOfSegments" : "SetLocalLength"; diff --git a/src/NETGENPlugin/NETGENPlugin_SimpleHypothesis_2D_i.hxx b/src/NETGENPlugin/NETGENPlugin_SimpleHypothesis_2D_i.hxx index 148169c..dcd47ed 100644 --- a/src/NETGENPlugin/NETGENPlugin_SimpleHypothesis_2D_i.hxx +++ b/src/NETGENPlugin/NETGENPlugin_SimpleHypothesis_2D_i.hxx @@ -79,18 +79,18 @@ class NETGENPLUGIN_EXPORT NETGENPlugin_SimpleHypothesis_2D_i: // method used to convert variable parameters stored in an old study // into myMethod2VarParams. It should return a method name for an index of // variable parameters. Index is countered from zero - virtual std::string getMethodOfParameter(const int paramIndex, int nbVars) const; + virtual std::string getMethodOfParameter(const int paramIndex, int /*nbVars*/) const; // Methods for copying mesh definition to other geometry // 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 { return 0; } + virtual bool getObjectsDependOn( std::vector< std::string > & /*entryArray*/, + std::vector< int > & /*subIDArray*/ ) const { return 0; } // Set new geometry instead of that returned by getObjectsDependOn() - virtual bool setObjectsDependOn( std::vector< std::string > & entryArray, - std::vector< int > & subIDArray ) { return true; } + virtual bool setObjectsDependOn( std::vector< std::string > & /*entryArray*/, + std::vector< int > & /*subIDArray*/ ) { return true; } }; #endif diff --git a/src/NETGENPlugin/NETGENPlugin_SimpleHypothesis_3D_i.hxx b/src/NETGENPlugin/NETGENPlugin_SimpleHypothesis_3D_i.hxx index e6f8496..4994e54 100644 --- a/src/NETGENPlugin/NETGENPlugin_SimpleHypothesis_3D_i.hxx +++ b/src/NETGENPlugin/NETGENPlugin_SimpleHypothesis_3D_i.hxx @@ -63,12 +63,12 @@ class NETGENPLUGIN_EXPORT NETGENPlugin_SimpleHypothesis_3D_i: // Methods for copying mesh definition to other geometry // 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 { return 0; } + virtual bool getObjectsDependOn( std::vector< std::string > & /*entryArray*/, + std::vector< int > & /*subIDArray*/ ) const { return 0; } // Set new geometry instead of that returned by getObjectsDependOn() - virtual bool setObjectsDependOn( std::vector< std::string > & entryArray, - std::vector< int > & subIDArray ) { return true; } + virtual bool setObjectsDependOn( std::vector< std::string > & /*entryArray*/, + std::vector< int > & /*subIDArray*/ ) { return true; } }; #endif