Salome HOME
projects
/
modules
/
smesh.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix compilation errors using gcc-5.X relating to explicit stream::operator bool()
[modules/smesh.git]
/
src
/
SMESHFiltersSelection
/
SMESH_Type.h
diff --git
a/src/SMESHFiltersSelection/SMESH_Type.h
b/src/SMESHFiltersSelection/SMESH_Type.h
index eeb605460aef0b164066c0a9825d831f33ae02f7..94e1b6fb4b9bda88878adab1a185c3d20d2cda05 100644
(file)
--- a/
src/SMESHFiltersSelection/SMESH_Type.h
+++ b/
src/SMESHFiltersSelection/SMESH_Type.h
@@
-1,4
+1,4
@@
-// Copyright (C) 2007-201
3
CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-201
5
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
//
// 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
// 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
//
// 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
#ifndef SMESH_TYPE_HEADER
#define SMESH_TYPE_HEADER
-#ifdef W
NT
+#ifdef W
IN32
#if defined SMESHFILTERSSELECTION_EXPORTS || defined SMESHFiltersSelection_EXPORTS
#define SMESHFILTERSSELECTION_EXPORT __declspec( dllexport )
#else
#if defined SMESHFILTERSSELECTION_EXPORTS || defined SMESHFiltersSelection_EXPORTS
#define SMESHFILTERSSELECTION_EXPORT __declspec( dllexport )
#else
@@
-39,7
+39,7
@@
#define SMESHFILTERSSELECTION_EXPORT
#endif
#define SMESHFILTERSSELECTION_EXPORT
#endif
-namespace SMESH{
+namespace SMESH
{
enum MeshObjectType {
HYPOTHESIS,
ALGORITHM,
enum MeshObjectType {
HYPOTHESIS,
ALGORITHM,
@@
-59,7
+59,10
@@
namespace SMESH{
GROUP_0D,
GROUP_BALL,
COMPONENT,
GROUP_0D,
GROUP_BALL,
COMPONENT,
- IDSOURCE
+ IDSOURCE,
+ IDSOURCE_EDGE, // IDSource including edges
+ IDSOURCE_FACE,
+ IDSOURCE_VOLUME
};
};
-}
;
+}
#endif
#endif