From ed74906e65bc10b15c497e8be5069e467700c80d Mon Sep 17 00:00:00 2001 From: mpa Date: Wed, 24 Feb 2016 16:37:09 +0300 Subject: [PATCH] OCCT 7.0.0 porting --- salome_adm/cmake_files/FindCAS.cmake | 2 -- src/Basics/Basics_OCCTVersion.hxx | 13 +++++++++++++ 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/salome_adm/cmake_files/FindCAS.cmake b/salome_adm/cmake_files/FindCAS.cmake index 97c182714..3e9ac7588 100644 --- a/salome_adm/cmake_files/FindCAS.cmake +++ b/salome_adm/cmake_files/FindCAS.cmake @@ -61,8 +61,6 @@ IF(NOT WIN32) SET(CAS_DEFINITIONS "${CAS_DEFINITIONS} -DHAVE_CONFIG_H") ENDIF() -SET(CAS_DEFINITIONS "${CAS_DEFINITIONS} -DOCC_CONVERT_SIGNALS") - # Test for 64 bit machine: IF(CMAKE_SIZEOF_VOID_P STREQUAL 8) SET(CAS_DEFINITIONS "${CAS_DEFINITIONS} -D_OCC64") diff --git a/src/Basics/Basics_OCCTVersion.hxx b/src/Basics/Basics_OCCTVersion.hxx index 2f9b49423..abeef2a13 100644 --- a/src/Basics/Basics_OCCTVersion.hxx +++ b/src/Basics/Basics_OCCTVersion.hxx @@ -28,6 +28,8 @@ #include +#include + // // NOTE: Since version 6.7.0 OCC_VERSION_DEVELOPMENT macro in the Standard_Version.hxx // points to the development status of the OCCT version: for example "dev", "alpha", @@ -48,4 +50,15 @@ # endif #endif +// temporary code for backward compatibility with OCCT +#if OCC_VERSION_MAJOR < 7 + #define OCCT_DEFINE_STANDARD_RTTIEXT(C1,C2) DEFINE_STANDARD_RTTI(C1) + #define OCCT_IMPLEMENT_STANDARD_RTTIEXT(C1,C2) \ + IMPLEMENT_STANDARD_HANDLE(C1,C2) \ + IMPLEMENT_STANDARD_RTTIEXT(C1,C2) +#else + #define OCCT_DEFINE_STANDARD_RTTIEXT(C1,C2) DEFINE_STANDARD_RTTIEXT(C1,C2) + #define OCCT_IMPLEMENT_STANDARD_RTTIEXT(C1,C2) IMPLEMENT_STANDARD_RTTIEXT(C1,C2) +#endif + #endif // BASICS_OCCTVERSION_HXX -- 2.39.2