From 24541acefeadf5b074eb2b465addf7e95cc7f6e7 Mon Sep 17 00:00:00 2001 From: vsr Date: Mon, 25 Sep 2017 17:12:46 +0300 Subject: [PATCH] Clean-up deprecated OCCT-related code --- src/BLSURFPlugin/BLSURFPlugin_Attractor.cxx | 7 ------- src/BLSURFPlugin/BLSURFPlugin_BLSURF.cxx | 9 --------- 2 files changed, 16 deletions(-) diff --git a/src/BLSURFPlugin/BLSURFPlugin_Attractor.cxx b/src/BLSURFPlugin/BLSURFPlugin_Attractor.cxx index c8f821a..5444010 100644 --- a/src/BLSURFPlugin/BLSURFPlugin_Attractor.cxx +++ b/src/BLSURFPlugin/BLSURFPlugin_Attractor.cxx @@ -40,9 +40,6 @@ #include #include -// kernel includes -#include - BLSURFPlugin_Attractor::BLSURFPlugin_Attractor () : _face(), _attractorShape(), @@ -197,11 +194,7 @@ void BLSURFPlugin_Attractor::edgeInit(Handle(Geom_Surface) theSurf, const TopoDS Handle(Geom_Curve) aCurve3d = BRep_Tool::Curve (anEdge, first, last); ShapeConstruct_ProjectCurveOnSurface curveProjector; curveProjector.Init(theSurf, Precision::Confusion()); -#if OCC_VERSION_LARGE > 0x07010000 curveProjector.Perform (aCurve3d, first, last, aCurve2d); -#else - curveProjector.PerformAdvanced (aCurve3d, first, last, aCurve2d); -#endif int N = 1200; for (i=0; i<=N; i++){ diff --git a/src/BLSURFPlugin/BLSURFPlugin_BLSURF.cxx b/src/BLSURFPlugin/BLSURFPlugin_BLSURF.cxx index ea2ecf6..2e143ac 100644 --- a/src/BLSURFPlugin/BLSURFPlugin_BLSURF.cxx +++ b/src/BLSURFPlugin/BLSURFPlugin_BLSURF.cxx @@ -37,7 +37,6 @@ extern "C"{ #include -#include #include #include @@ -2019,11 +2018,7 @@ bool BLSURFPlugin_BLSURF::compute(SMESH_Mesh& aMesh, * (For this face, it will be called by cadsurf with your_face_object_ptr * as last parameter. */ -#if OCC_VERSION_MAJOR < 7 - cad_face_t *fce = cad_face_new(c, iface, surf_fun, surfaces.back()); -#else cad_face_t *fce = cad_face_new(c, iface, surf_fun, surfaces.back().get()); -#endif /* by default a face has no tag (color). The following call sets it to the same value as the Geom module ID : */ @@ -2224,11 +2219,7 @@ bool BLSURFPlugin_BLSURF::compute(SMESH_Mesh& aMesh, } /* attach the edge to the current cadsurf face */ -#if OCC_VERSION_MAJOR < 7 - cad_edge_t *edg = cad_edge_new(fce, ic, tmin, tmax, curv_fun, curves.back()); -#else cad_edge_t *edg = cad_edge_new(fce, ic, tmin, tmax, curv_fun, curves.back().get()); -#endif /* by default an edge has no tag (color). The following call sets it to the same value as the edge_id : */ -- 2.39.2