fight warnings c++17, additional corrections

diff --git a/src/GUI/NETGENPluginGUI_HypothesisCreator.h b/src/GUI/NETGENPluginGUI_HypothesisCreator.h
index 89004b88e14a95c6ad47145e55c0a26e1755bd8f..f5f7ded0dd611487710270eb98a579eecdcc558b 100644 (file)
--- 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&) const;
   virtual QString  helpPage() const;
 
 protected:

diff --git a/src/NETGENPlugin/NETGENPlugin_Hypothesis.hxx b/src/NETGENPlugin/NETGENPlugin_Hypothesis.hxx
index 7b8afae17b62e5c446b44c315d42c01776004c66..37009f6a5e0fabeb4c27820f445fdba7f759308d 100644 (file)
--- 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.hxx b/src/NETGENPlugin/NETGENPlugin_Hypothesis_i.hxx
index 614bf6e972ca80e73ee3a031cf28f82d7ef550a3..e38b80908d62fab71a247cc7083c9d0133102f83 100644 (file)
--- 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 48d6383e1ec9da76d4a80e0492b1bae9aa7f63fc..03df4247fe656c69cbf46179bd317f1ebef276ee 100644 (file)
--- a/src/NETGENPlugin/NETGENPlugin_Mesher.cxx
+++ b/src/NETGENPlugin/NETGENPlugin_Mesher.cxx
@@ -319,7 +319,7 @@ namespace
           OCC_CATCH_SIGNALS;
           BRepMesh_IncrementalMesh e(shape, 0.01, true);
         }
-        catch (Standard_Failure)
+        catch (Standard_Failure&)
         {
         }
   //       updated.erase( triangulation.operator->() );
@@ -3163,7 +3163,7 @@ bool NETGENPlugin_Mesher::Compute()
         comment << text(ex);
         //err = 1; -- try to make volumes anyway
       }
-      catch (netgen::NgException exc)
+      catch (netgen::NgException& exc)
       {
         comment << text(exc);
         //err = 1; -- try to make volumes anyway
@@ -3289,7 +3289,7 @@ bool NETGENPlugin_Mesher::Compute()
           comment << text(ex);
         err = 1;
       }
-      catch (netgen::NgException exc)
+      catch (netgen::NgException& exc)
       {
         if ( comment.empty() ) // do not overwrite a previous error
           comment << text(exc);
@@ -3320,7 +3320,7 @@ bool NETGENPlugin_Mesher::Compute()
           if ( comment.empty() ) // do not overwrite a previous error
             comment << text(ex);
         }
-        catch (netgen::NgException exc)
+        catch (netgen::NgException& exc)
         {
           if ( comment.empty() ) // do not overwrite a previous error
             comment << text(exc);
@@ -3361,7 +3361,7 @@ bool NETGENPlugin_Mesher::Compute()
         if ( comment.empty() ) // do not overwrite a previous error
           comment << "Exception in netgen at passing to 2nd order ";
       }
-      catch (netgen::NgException exc)
+      catch (netgen::NgException& exc)
       {
         if ( comment.empty() ) // do not overwrite a previous error
           comment << exc.What();

diff --git a/src/NETGENPlugin/NETGENPlugin_Mesher.hxx b/src/NETGENPlugin/NETGENPlugin_Mesher.hxx
index 1d4e62b1fdbb1db049655e606d374c6e218f5974..9299dca06b095fbcf639106d71da4ac4bbe896a9 100644 (file)
--- 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_NETGEN_3D.cxx b/src/NETGENPlugin/NETGENPlugin_NETGEN_3D.cxx
index 76eef6f44ff81c861c4a3010bbce5bbbc71c5588..a3425b50609206dfb52f1ead47b98c3fcff3be66 100644 (file)
--- a/src/NETGENPlugin/NETGENPlugin_NETGEN_3D.cxx
+++ b/src/NETGENPlugin/NETGENPlugin_NETGEN_3D.cxx
@@ -519,7 +519,7 @@ bool NETGENPlugin_NETGEN_3D::compute(SMESH_Mesh&                     aMesh,
       str << ": " << ex.GetMessageString();
     error(str);
   }
-  catch (netgen::NgException exc)
+  catch (netgen::NgException& exc)
   {
     SMESH_Comment str("NgException");
     if ( strlen( netgen::multithread.task ) > 0 )

diff --git a/src/NETGENPlugin/NETGENPlugin_Remesher_2D.hxx b/src/NETGENPlugin/NETGENPlugin_Remesher_2D.hxx
index 3cb6f57218815253a10cd1bdeb62c7d55069d273..b1fad2a03c2718d8c24ce7924c5cf9b4fc67d01a 100644 (file)
--- 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.hxx b/src/NETGENPlugin/NETGENPlugin_SimpleHypothesis_2D_i.hxx
index dcd47ed3d0e53155c892b7f87a4ce5eef22aa5be..d0847685282272a8e08c345a81875c7da6c7812d 100644 (file)
--- a/src/NETGENPlugin/NETGENPlugin_SimpleHypothesis_2D_i.hxx
+++ b/src/NETGENPlugin/NETGENPlugin_SimpleHypothesis_2D_i.hxx
@@ -49,7 +49,7 @@ class NETGENPLUGIN_EXPORT  NETGENPlugin_SimpleHypothesis_2D_i:
   // Destructor
   virtual ~NETGENPlugin_SimpleHypothesis_2D_i();
 
-  void SetNumberOfSegments(CORBA::Short nb) ;
+  void SetNumberOfSegments(CORBA::Short nb);
   CORBA::Short GetNumberOfSegments();
 
   void SetLocalLength(CORBA::Double segmentLength);
@@ -79,7 +79,7 @@ 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

diff --git a/src/NETGENPlugin/NETGENPlugin_i.cxx b/src/NETGENPlugin/NETGENPlugin_i.cxx
index 11c68c82dd41ec9bce990b86c9365e425ddcb9e6..5598608399bf86d1ea477b0d7160fcc073f9c9d2 100644 (file)
--- a/src/NETGENPlugin/NETGENPlugin_i.cxx
+++ b/src/NETGENPlugin/NETGENPlugin_i.cxx
@@ -86,7 +86,6 @@ extern "C"
       aCreator = new NETGENPlugin_Creator_i<NETGENPlugin_SimpleHypothesis_3D_i>;
     else if (strcmp(aHypName, "NETGEN_RemesherParameters_2D") == 0)
       aCreator = new NETGENPlugin_Creator_i<NETGENPlugin_RemesherHypothesis_2D_i>;
-    else ;
 
     return aCreator;
   }