Merge branch 'master' into V7_5_BR

[modules/geom.git] / src / GEOMImpl / GEOMImpl_IPartition.hxx

diff --git a/src/GEOMImpl/GEOMImpl_IPartition.hxx b/src/GEOMImpl/GEOMImpl_IPartition.hxx
index d0c2022068c7b7298fbca1886069be18bbcb6814..105ff257d647035342149e86ee2b86fea790a0a6 100644 (file)
--- a/src/GEOMImpl/GEOMImpl_IPartition.hxx
+++ b/src/GEOMImpl/GEOMImpl_IPartition.hxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2013  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2014  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
@@ -39,7 +39,7 @@
 #define PART_ARG_PLANE 8
 
 #define PART_ARG_KEEP_NONLIMIT_SHAPES 9
-#define BOOL_ARG_CHECK_SELF_INTERSECTION 10
+#define PART_ARG_CHECK_SELF_INTERSECTION 10
 
 class GEOMImpl_IPartition
 {
@@ -68,7 +68,7 @@ class GEOMImpl_IPartition
   { _func->SetIntegerArray(PART_ARG_MATERIALS, theMaterials); }
 
   void SetCheckSelfIntersection (Standard_Boolean theFlag)
-  { _func->SetInteger(BOOL_ARG_CHECK_SELF_INTERSECTION, theFlag ? 1 : 0); }
+  { _func->SetInteger(PART_ARG_CHECK_SELF_INTERSECTION, theFlag ? 1 : 0); }
 
   int GetLimit() { return _func->GetInteger(PART_ARG_LIMIT); }
 
@@ -89,7 +89,7 @@ class GEOMImpl_IPartition
   Handle(GEOM_Function) GetPlane() { return _func->GetReference(PART_ARG_PLANE); }
 
   Standard_Boolean GetCheckSelfIntersection()
-  { return (_func->GetInteger(BOOL_ARG_CHECK_SELF_INTERSECTION) != 0); }
+  { return (_func->GetInteger(PART_ARG_CHECK_SELF_INTERSECTION) != 0); }
 
  private: