fight warnings, c++17. additional corrections+++

diff --git a/src/SMESHGUI/SMESHGUI_GEOMGenUtils.cxx b/src/SMESHGUI/SMESHGUI_GEOMGenUtils.cxx
index 4362d0ee1acc6bfa99e304e82f8165a17470cb1c..b366ff6f30114fc432b59c81c7eca743c72bfa80 100644 (file)
--- a/src/SMESHGUI/SMESHGUI_GEOMGenUtils.cxx
+++ b/src/SMESHGUI/SMESHGUI_GEOMGenUtils.cxx
@@ -46,7 +46,7 @@ namespace SMESH
 {
   GEOM::GEOM_Gen_var GetGEOMGen( GEOM::GEOM_Object_ptr go )
   {
-    GEOM::GEOM_Gen_ptr gen = GEOM::GEOM_Gen::_nil();;
+    GEOM::GEOM_Gen_ptr gen = GEOM::GEOM_Gen::_nil();
     if ( !CORBA::is_nil( go ))
       gen = go->GetGen();
     return gen;

diff --git a/src/SMESH_I/SMESH_2smeshpy.cxx b/src/SMESH_I/SMESH_2smeshpy.cxx
index e34874cb0c17a6814292c3a2b1a061d22a53e26c..db7e04afa7a985ce7c01a20a1f017c8c5f15ef5c 100644 (file)
--- a/src/SMESH_I/SMESH_2smeshpy.cxx
+++ b/src/SMESH_I/SMESH_2smeshpy.cxx
@@ -950,7 +950,7 @@ Handle(_pyCommand) _pyGen::AddCommand( const TCollection_AsciiString& theCommand
         if ( -1 < iGeom && iGeom < nbTypes )
           Threshold = SMESH + types[ iGeom ];
 #ifdef _DEBUG_
-        // is 'types' complete? (compilation failure mains that enum EntityType changed)
+        // is 'types' complete? (compilation failure means that enum EntityType changed)
         int _asrt[( sizeof(types) / sizeof(const char*) == nbTypes ) ? 2 : -1 ]; _asrt[0]=_asrt[1]; // _asrt[1] may be used uninitialized => replace this with static_assert?
 #endif
       }

diff --git a/src/SMESH_I/SMESH_Gen_i.cxx b/src/SMESH_I/SMESH_Gen_i.cxx
index 4a751d153ea27c26cf573b931369e776bf2fa579..fd8f2846d143fda23558f29f7fcc08b6bdcee8a0 100644 (file)
--- a/src/SMESH_I/SMESH_Gen_i.cxx
+++ b/src/SMESH_I/SMESH_Gen_i.cxx
@@ -295,7 +295,7 @@ GEOM::GEOM_Gen_var SMESH_Gen_i::GetGeomEngine( bool isShaper )
 
 GEOM::GEOM_Gen_var SMESH_Gen_i::GetGeomEngine( GEOM::GEOM_Object_ptr go )
 {
-  GEOM::GEOM_Gen_ptr gen = GEOM::GEOM_Gen::_nil();;
+  GEOM::GEOM_Gen_ptr gen = GEOM::GEOM_Gen::_nil();
   if ( !CORBA::is_nil( go ))
     gen = go->GetGen();
   return gen;