X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FSMESHFiltersSelection%2FSMESH_Type.h;h=9398fe6499b4cf733f348e2475bf4c772e432975;hb=2a6e16b7faacf40cf3b91605690ce04f14141f1b;hp=e29c918a07dced71801bf5fa6631161bfda1e1d6;hpb=bd4e115a78b52e3fbc016e5e30bb0e19b2a9e7d6;p=modules%2Fsmesh.git

diff --git a/src/SMESHFiltersSelection/SMESH_Type.h b/src/SMESHFiltersSelection/SMESH_Type.h
index e29c918a0..9398fe649 100644
--- a/src/SMESHFiltersSelection/SMESH_Type.h
+++ b/src/SMESHFiltersSelection/SMESH_Type.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2015  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -6,7 +6,7 @@
 // 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
@@ -29,7 +29,7 @@
 #ifndef SMESH_TYPE_HEADER
 #define SMESH_TYPE_HEADER
 
-#ifdef WNT
+#ifdef WIN32
  #if defined SMESHFILTERSSELECTION_EXPORTS || defined SMESHFiltersSelection_EXPORTS
   #define SMESHFILTERSSELECTION_EXPORT __declspec( dllexport )
  #else
@@ -39,26 +39,30 @@
  #define SMESHFILTERSSELECTION_EXPORT
 #endif
 
-enum MeshObjectType {
-  HYPOTHESIS,
-  ALGORITHM,
-  MESH,
-  SUBMESH,
-  MESHorSUBMESH,
-  SUBMESH_VERTEX,
-  SUBMESH_EDGE,
-  SUBMESH_FACE,
-  SUBMESH_SOLID,
-  SUBMESH_COMPOUND,
-  GROUP,
-  GROUP_NODE,
-  GROUP_EDGE,
-  GROUP_FACE,
-  GROUP_VOLUME,
-  GROUP_0D,
-  GROUP_BALL,
-  COMPONENT,
-  IDSOURCE
+namespace SMESH{
+  enum MeshObjectType {
+    HYPOTHESIS,
+    ALGORITHM,
+    MESH,
+    SUBMESH,
+    MESHorSUBMESH,
+    SUBMESH_VERTEX,
+    SUBMESH_EDGE,
+    SUBMESH_FACE,
+    SUBMESH_SOLID,
+    SUBMESH_COMPOUND,
+    GROUP,
+    GROUP_NODE,
+    GROUP_EDGE,
+    GROUP_FACE,
+    GROUP_VOLUME,
+    GROUP_0D,
+    GROUP_BALL,
+    COMPONENT,
+    IDSOURCE,
+    IDSOURCE_EDGE, // IDSource including edges
+    IDSOURCE_FACE,
+    IDSOURCE_VOLUME
+  };
 };
-
 #endif