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
Migration to OpenCASCADE CMake configuration
[modules/geom.git]
/
src
/
GEOMAlgo
/
GEOMAlgo_GluerAlgo.hxx
diff --git
a/src/GEOMAlgo/GEOMAlgo_GluerAlgo.hxx
b/src/GEOMAlgo/GEOMAlgo_GluerAlgo.hxx
index a1258516bfa273fbbb881c7139a5b44857b4998b..3fa6fce4027e879b805688829f2a12cbe8a0bb24 100644
(file)
--- a/
src/GEOMAlgo/GEOMAlgo_GluerAlgo.hxx
+++ b/
src/GEOMAlgo/GEOMAlgo_GluerAlgo.hxx
@@
-1,4
+1,4
@@
-// Copyright (C) 2007-201
4
CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-201
6
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
@@
-27,18
+27,11
@@
#ifndef _GEOMAlgo_GluerAlgo_HeaderFile
#define _GEOMAlgo_GluerAlgo_HeaderFile
#ifndef _GEOMAlgo_GluerAlgo_HeaderFile
#define _GEOMAlgo_GluerAlgo_HeaderFile
-#include <Basics_OCCTVersion.hxx>
-
#include <Standard_Macro.hxx>
#include <TopoDS_Shape.hxx>
#include <Standard_Real.hxx>
#include <Standard_Boolean.hxx>
#include <Standard_Macro.hxx>
#include <TopoDS_Shape.hxx>
#include <Standard_Real.hxx>
#include <Standard_Boolean.hxx>
-
-#if OCC_VERSION_LARGE > 0x06070100
#include <IntTools_Context.hxx>
#include <IntTools_Context.hxx>
-#else
-#include <BOPInt_Context.hxx>
-#endif
#include <TopTools_DataMapOfShapeListOfShape.hxx>
#include <TopTools_DataMapOfShapeShape.hxx>
#include <TopTools_DataMapOfShapeListOfShape.hxx>
#include <TopTools_DataMapOfShapeShape.hxx>
@@
-80,18
+73,10
@@
public:
virtual void Clear() ;
Standard_EXPORT
virtual void Clear() ;
Standard_EXPORT
-#if OCC_VERSION_LARGE > 0x06070100
void SetContext(const Handle(IntTools_Context)&) ;
void SetContext(const Handle(IntTools_Context)&) ;
-#else
- void SetContext(const Handle(BOPInt_Context)&) ;
-#endif
Standard_EXPORT
Standard_EXPORT
-#if OCC_VERSION_LARGE > 0x06070100
const Handle(IntTools_Context)& Context() ;
const Handle(IntTools_Context)& Context() ;
-#else
- const Handle(BOPInt_Context)& Context() ;
-#endif
Standard_EXPORT
const TopTools_DataMapOfShapeListOfShape& Images() const;
Standard_EXPORT
const TopTools_DataMapOfShapeListOfShape& Images() const;
@@
-103,11
+88,7
@@
protected:
TopoDS_Shape myArgument;
Standard_Real myTolerance;
Standard_Boolean myCheckGeometry;
TopoDS_Shape myArgument;
Standard_Real myTolerance;
Standard_Boolean myCheckGeometry;
-#if OCC_VERSION_LARGE > 0x06070100
Handle(IntTools_Context) myContext;
Handle(IntTools_Context) myContext;
-#else
- Handle(BOPInt_Context) myContext;
-#endif
TopTools_DataMapOfShapeListOfShape myImages;
TopTools_DataMapOfShapeShape myOrigins;
TopTools_DataMapOfShapeListOfShape myImages;
TopTools_DataMapOfShapeShape myOrigins;