Avoid "GROUP" redefinition on win32: add 'MeshObjectType'enum to namespace SMESH

diff --git a/src/GUI/BLSURFPluginGUI_HypothesisCreator.cxx b/src/GUI/BLSURFPluginGUI_HypothesisCreator.cxx
index 4884edfc7f309793616b9d6359c573c86acf076e..981bada77f2212872053a6b3b9afa4f3707d2834 100644 (file)
--- a/src/GUI/BLSURFPluginGUI_HypothesisCreator.cxx
+++ b/src/GUI/BLSURFPluginGUI_HypothesisCreator.cxx
@@ -440,7 +440,7 @@ bool EnforcedTreeWidgetDelegate::vertexExists(QAbstractItemModel *model,
 // 
 // 
 // BLSURFPluginGUI_ObjectReferenceParamWdg::BLSURFPluginGUI_ObjectReferenceParamWdg
-// ( MeshObjectType objType, QWidget* parent, bool multiSelection )
+// ( SMESH::MeshObjectType objType, QWidget* parent, bool multiSelection )
 //   : StdMeshersGUI_ObjectReferenceParamWdg( objType, parent, multiSelection )
 // {
 //   init();

diff --git a/src/GUI/BLSURFPluginGUI_HypothesisCreator.h b/src/GUI/BLSURFPluginGUI_HypothesisCreator.h
index efd475aa911f98f30f5cc00e26bd8801103f7d6d..6149c533071472d36207e737985ca4f456f34ae7 100644 (file)
--- a/src/GUI/BLSURFPluginGUI_HypothesisCreator.h
+++ b/src/GUI/BLSURFPluginGUI_HypothesisCreator.h
@@ -149,7 +149,7 @@ typedef struct
 //   BLSURFPluginGUI_ObjectReferenceParamWdg( SUIT_SelectionFilter* filter, 
 //                                          QWidget*              parent,
 //                                          bool                  multiSelection=false);
-//   BLSURFPluginGUI_ObjectReferenceParamWdg( MeshObjectType objType,
+//   BLSURFPluginGUI_ObjectReferenceParamWdg( SMESH::MeshObjectType objType,
 //                                          QWidget*       parent,
 //                                          bool           multiSelection=false);
 //   ~BLSURFPluginGUI_ObjectReferenceParamWdg();