Merge remote branch 'origin/V7_dev'

diff --git a/src/SMESHGUI/SMESHGUI.cxx b/src/SMESHGUI/SMESHGUI.cxx
index a08aefbc49b69820bfbe032fbcdb31e3f4afd041..93b57979848335603cd9a6cbcd5f84f6a6cf85c0 100644 (file)
--- a/src/SMESHGUI/SMESHGUI.cxx
+++ b/src/SMESHGUI/SMESHGUI.cxx
@@ -586,7 +586,7 @@ namespace
         "SMESH_OCTAHEDRA","SMESH_POLYEDRONS","SMESH_QUADRATIC_POLYEDRONS","SMESH_BALLS"
       };
       // is typeMsg complete? (compilation failure mains that enum SMDSAbs_EntityType changed)
-      int nbTypes = sizeof( typeMsg ) / sizeof( const char* );
+      const int nbTypes = sizeof( typeMsg ) / sizeof( const char* );
       int _assert[( nbTypes == SMESH::Entity_Last ) ? 1 : -1 ]; _assert[0]=1;
 
       QString andStr = " " + QObject::tr("SMESH_AND") + " ", comma(", ");