Salome HOME
projects
/
modules
/
shaper.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Issue #3052: Conflicting constraint after trim ellipse
[modules/shaper.git]
/
src
/
GeomAlgoImpl
/
GEOMAlgo_Splitter.hxx
diff --git
a/src/GeomAlgoImpl/GEOMAlgo_Splitter.hxx
b/src/GeomAlgoImpl/GEOMAlgo_Splitter.hxx
index ad827f3e4517475677f4ce5be8b1b19ae3566c14..58020b2b1ed6ec3b119faf62d8a2f9b16a508393 100644
(file)
--- a/
src/GeomAlgoImpl/GEOMAlgo_Splitter.hxx
+++ b/
src/GeomAlgoImpl/GEOMAlgo_Splitter.hxx
@@
-1,4
+1,4
@@
-// Copyright (C) 2007-201
5
CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-201
9
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
@@
-36,9
+36,6
@@
#include <TopoDS_Shape.hxx>
#include <TopoDS_Shape.hxx>
-#include <BOPCol_ListOfShape.hxx>
-#include <BOPCol_MapOfShape.hxx>
-
#include <BOPAlgo_Builder.hxx>
//=======================================================================
#include <BOPAlgo_Builder.hxx>
//=======================================================================
@@
-67,7
+64,7
@@
GEOMALGOIMPL_EXPORT void AddTool(const TopoDS_Shape& theShape);
/// Returns list of tool shapes
GEOMALGOIMPL_EXPORT void AddTool(const TopoDS_Shape& theShape);
/// Returns list of tool shapes
- GEOMALGOIMPL_EXPORT const
BOPCol_ListOfShape
& Tools()const;
+ GEOMALGOIMPL_EXPORT const
NCollection_List<TopoDS_Shape>
& Tools()const;
/// Set type of used shapes
/// \param aLimit a shape type
/// Set type of used shapes
/// \param aLimit a shape type
@@
-96,10
+93,10
@@
protected:
/// List of tools
protected:
/// List of tools
- BOPCol_ListOfShape myTools;
+ NCollection_List<TopoDS_Shape> myTools;
/// Map of tools
/// Map of tools
- BOPCol_MapOfShape myMapTools;
+ NCollection_Map<TopoDS_Shape> myMapTools;
/// A limit type
TopAbs_ShapeEnum myLimit;
/// A limit type
TopAbs_ShapeEnum myLimit;