Salome HOME
projects
/
modules
/
geom.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
OCCT dev version porting (6.7.2)
[modules/geom.git]
/
src
/
GEOMAlgo
/
GEOMAlgo_VertexSolid.cxx
diff --git
a/src/GEOMAlgo/GEOMAlgo_VertexSolid.cxx
b/src/GEOMAlgo/GEOMAlgo_VertexSolid.cxx
index 71760aa183193c652a8492af0230644befcd0669..982e21921f602a39a10d68c1fa57ae6af7f5b6de 100644
(file)
--- a/
src/GEOMAlgo/GEOMAlgo_VertexSolid.cxx
+++ b/
src/GEOMAlgo/GEOMAlgo_VertexSolid.cxx
@@
-1,4
+1,4
@@
-// Copyright (C) 2007-201
3
CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-201
4
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
@@
-27,6
+27,8
@@
//
#include <GEOMAlgo_VertexSolid.hxx>
//
#include <GEOMAlgo_VertexSolid.hxx>
+#include <Basics_OCCTVersion.hxx>
+
#include <gp_Pnt.hxx>
#include <TopAbs_ShapeEnum.hxx>
#include <gp_Pnt.hxx>
#include <TopAbs_ShapeEnum.hxx>
@@
-46,7
+48,11
@@
#include <BRepClass3d_SolidClassifier.hxx>
//
#include <BOPCol_ListOfShape.hxx>
#include <BRepClass3d_SolidClassifier.hxx>
//
#include <BOPCol_ListOfShape.hxx>
+#if OCC_VERSION_LARGE > 0x06070100
+#include <IntTools_Context.hxx>
+#else
#include <BOPInt_Context.hxx>
#include <BOPInt_Context.hxx>
+#endif
//
#include <BOPDS_DS.hxx>
#include <BOPDS_IndexRange.hxx>
//
#include <BOPDS_DS.hxx>
#include <BOPDS_IndexRange.hxx>
@@
-142,7
+148,11
@@
void GEOMAlgo_VertexSolid::BuildResult()
const TopoDS_Shape& aTool=aLS.Last();
const TopoDS_Solid& aSolid=(myRank==0) ? TopoDS::Solid(aTool) : TopoDS::Solid(aObj);
//
const TopoDS_Shape& aTool=aLS.Last();
const TopoDS_Solid& aSolid=(myRank==0) ? TopoDS::Solid(aTool) : TopoDS::Solid(aObj);
//
+#if OCC_VERSION_LARGE > 0x06070100
+ Handle(IntTools_Context) aCtx=myDSFiller->Context();
+#else
Handle(BOPInt_Context) aCtx=myDSFiller->Context();
Handle(BOPInt_Context) aCtx=myDSFiller->Context();
+#endif
BRepClass3d_SolidClassifier& aSC=aCtx->SolidClassifier(aSolid);
//
aNbRanges=aDS.NbRanges();
BRepClass3d_SolidClassifier& aSC=aCtx->SolidClassifier(aSolid);
//
aNbRanges=aDS.NbRanges();