From 209c7e2a0ca7a9323cc63e6b2ad5067b567534af Mon Sep 17 00:00:00 2001 From: mpa Date: Wed, 24 Feb 2016 16:50:06 +0300 Subject: [PATCH] Migration to OCCT 7.0 --- src/BLSURFPlugin/BLSURFPlugin_Attractor.hxx | 4 ---- src/BLSURFPlugin/BLSURFPlugin_BLSURF.cxx | 8 ++++++++ 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/src/BLSURFPlugin/BLSURFPlugin_Attractor.hxx b/src/BLSURFPlugin/BLSURFPlugin_Attractor.hxx index aab5ca5..b3ef69a 100644 --- a/src/BLSURFPlugin/BLSURFPlugin_Attractor.hxx +++ b/src/BLSURFPlugin/BLSURFPlugin_Attractor.hxx @@ -48,12 +48,8 @@ #include #include -#include #include -#include #include -#include -#include #include #include #include diff --git a/src/BLSURFPlugin/BLSURFPlugin_BLSURF.cxx b/src/BLSURFPlugin/BLSURFPlugin_BLSURF.cxx index 1f64b0f..2af4164 100644 --- a/src/BLSURFPlugin/BLSURFPlugin_BLSURF.cxx +++ b/src/BLSURFPlugin/BLSURFPlugin_BLSURF.cxx @@ -2111,7 +2111,11 @@ 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 : */ @@ -2366,7 +2370,11 @@ 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