Copyright update 2020

[plugins/netgenplugin.git] / src / NETGENPlugin / NETGENPlugin_SimpleHypothesis_3D.cxx

diff --git a/src/NETGENPlugin/NETGENPlugin_SimpleHypothesis_3D.cxx b/src/NETGENPlugin/NETGENPlugin_SimpleHypothesis_3D.cxx
index 3fb1d3f524bf77c14a475f2184f2bc4265cb00ff..d566d15024ca48e626daa99dc5521c97acf170d5 100644 (file)
--- a/src/NETGENPlugin/NETGENPlugin_SimpleHypothesis_3D.cxx
+++ b/src/NETGENPlugin/NETGENPlugin_SimpleHypothesis_3D.cxx
@@ -1,9 +1,9 @@
-// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2020  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
 // License as published by the Free Software Foundation; either
-// version 2.1 of the License.
+// version 2.1 of the License, or (at your option) any later version.
 //
 // This library is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -26,6 +26,9 @@
 #include "NETGENPlugin_SimpleHypothesis_3D.hxx"
 #include "NETGENPlugin_Hypothesis.hxx"
 
+#include <SMDS_Mesh.hxx>
+#include <SMESHDS_Mesh.hxx>
+#include <SMESHDS_SubMesh.hxx>
 #include <SMESH_ControlsDef.hxx>
 #include <SMESH_Mesh.hxx>
 #include <SMESH_subMesh.hxx>
@@ -42,9 +45,8 @@ using namespace std;
  */
 //=============================================================================
 NETGENPlugin_SimpleHypothesis_3D::NETGENPlugin_SimpleHypothesis_3D (int         hypId,
-                                                                    int         studyId,
                                                                     SMESH_Gen * gen)
-  : NETGENPlugin_SimpleHypothesis_2D(hypId, studyId, gen),
+  : NETGENPlugin_SimpleHypothesis_2D(hypId, gen),
   _volume(0)
 {
   _name = "NETGEN_SimpleParameters_3D";
@@ -106,7 +108,7 @@ istream & NETGENPlugin_SimpleHypothesis_3D::LoadFrom(istream & load)
   bool isOK = true;
   double val;
 
-  isOK = (load >> val);
+  isOK = static_cast<bool>(load >> val);
   if (isOK)
     _volume = val;
   else