From 62f86de81d3a41d7b42c8fd666004726dfdb6c93 Mon Sep 17 00:00:00 2001 From: vsr Date: Mon, 25 Sep 2017 17:18:39 +0300 Subject: [PATCH] Clean-up deprecated OCCT-related code --- src/HEXABLOCK/HexNewShape.cxx | 7 ------- src/HEXABLOCKGUI/HEXABLOCKGUI_SalomeTools.cxx | 6 ------ 2 files changed, 13 deletions(-) diff --git a/src/HEXABLOCK/HexNewShape.cxx b/src/HEXABLOCK/HexNewShape.cxx index fc4e23f..7de1488 100755 --- a/src/HEXABLOCK/HexNewShape.cxx +++ b/src/HEXABLOCK/HexNewShape.cxx @@ -55,8 +55,6 @@ #include #include -#include - BEGIN_NAMESPACE_HEXA static bool db = on_debug (); // == getenv ("HEXA_DB") > 0 @@ -179,12 +177,7 @@ int NewShape::transfoShape (Matrix& matrice, SubShape* shape) gp_Trsf transfo; double a11,a12,a13,a14, a21,a22,a23,a24, a31,a32,a33,a34; matrice.getCoeff (a11,a12,a13,a14, a21,a22,a23,a24, a31,a32,a33,a34); -#if OCC_VERSION_LARGE > 0x06070100 transfo.SetValues (a11,a12,a13,a14, a21,a22,a23,a24, a31,a32,a33,a34); -#else - transfo.SetValues (a11,a12,a13,a14, a21,a22,a23,a24, a31,a32,a33,a34, - Epsil2, Epsil2); -#endif TopoDS_Shape shape_orig = shape->getShape (); BRepBuilderAPI_Transform builder (shape_orig, transfo, Standard_True); diff --git a/src/HEXABLOCKGUI/HEXABLOCKGUI_SalomeTools.cxx b/src/HEXABLOCKGUI/HEXABLOCKGUI_SalomeTools.cxx index 27a62c4..2fed0c5 100644 --- a/src/HEXABLOCKGUI/HEXABLOCKGUI_SalomeTools.cxx +++ b/src/HEXABLOCKGUI/HEXABLOCKGUI_SalomeTools.cxx @@ -28,8 +28,6 @@ #include #include -#include - #include #include @@ -175,14 +173,10 @@ namespace GUI Handle(SelectMgr_Selection) sel = theObj->Selection( m ); for ( sel->Init(); sel->More(); sel->Next() ) { -#if OCC_VERSION_LARGE > 0x06080100 const Handle(SelectMgr_SensitiveEntity) aHSenEntity = sel->Sensitive(); if ( aHSenEntity.IsNull() ) continue; Handle(SelectBasics_SensitiveEntity) entity = aHSenEntity->BaseSensitive(); -#else - Handle(SelectBasics_SensitiveEntity) entity = sel->Sensitive(); -#endif if ( entity.IsNull() ) continue; -- 2.30.2