From: vsr <vsr@opencascade.com>
Date: Tue, 20 Oct 2020 07:06:13 +0000 (+0300)
Subject: fight warnings, c++17. additional corrections+++
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=9ce044f12e11e3071624f028142547be6f252a39;p=modules%2Fsmesh.git

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

diff --git a/src/SMESHGUI/SMESHGUI_GEOMGenUtils.cxx b/src/SMESHGUI/SMESHGUI_GEOMGenUtils.cxx
index 4362d0ee1..b366ff6f3 100644
--- 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 e34874cb0..db7e04afa 100644
--- 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 4a751d153..fd8f2846d 100644
--- 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;