X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;ds=inline;f=src%2FGEOMAlgo%2FGEOMAlgo_GluerAlgo.hxx;h=3fa6fce4027e879b805688829f2a12cbe8a0bb24;hb=9fe1f193a471c9610768d80f61c7cb09b5e3464a;hp=a1258516bfa273fbbb881c7139a5b44857b4998b;hpb=dc562ec459ca37e90b612ce81b0312ce3ff1096b;p=modules%2Fgeom.git diff --git a/src/GEOMAlgo/GEOMAlgo_GluerAlgo.hxx b/src/GEOMAlgo/GEOMAlgo_GluerAlgo.hxx index a1258516b..3fa6fce40 100644 --- a/src/GEOMAlgo/GEOMAlgo_GluerAlgo.hxx +++ b/src/GEOMAlgo/GEOMAlgo_GluerAlgo.hxx @@ -1,4 +1,4 @@ -// Copyright (C) 2007-2014 CEA/DEN, EDF R&D, OPEN CASCADE +// Copyright (C) 2007-2016 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 @@ -27,18 +27,11 @@ #ifndef _GEOMAlgo_GluerAlgo_HeaderFile #define _GEOMAlgo_GluerAlgo_HeaderFile -#include - #include #include #include #include - -#if OCC_VERSION_LARGE > 0x06070100 #include -#else -#include -#endif #include #include @@ -80,18 +73,10 @@ public: virtual void Clear() ; Standard_EXPORT -#if OCC_VERSION_LARGE > 0x06070100 void SetContext(const Handle(IntTools_Context)&) ; -#else - void SetContext(const Handle(BOPInt_Context)&) ; -#endif Standard_EXPORT -#if OCC_VERSION_LARGE > 0x06070100 const Handle(IntTools_Context)& Context() ; -#else - const Handle(BOPInt_Context)& Context() ; -#endif Standard_EXPORT const TopTools_DataMapOfShapeListOfShape& Images() const; @@ -103,11 +88,7 @@ protected: TopoDS_Shape myArgument; Standard_Real myTolerance; Standard_Boolean myCheckGeometry; -#if OCC_VERSION_LARGE > 0x06070100 Handle(IntTools_Context) myContext; -#else - Handle(BOPInt_Context) myContext; -#endif TopTools_DataMapOfShapeListOfShape myImages; TopTools_DataMapOfShapeShape myOrigins;