OCCT 6.9.0 (IR-2015-05-23) compatibility

diff --git a/src/CurveCreator/CMakeLists.txt b/src/CurveCreator/CMakeLists.txt
index e17655aa69d66cd65265181548c1391aa85076fe..ed4a31fe37688861345095834e459659c5c02930 100644 (file)
--- a/src/CurveCreator/CMakeLists.txt
+++ b/src/CurveCreator/CMakeLists.txt
@@ -39,6 +39,11 @@ ADD_DEFINITIONS(
   ${QT_DEFINITIONS}
 )
 
+# VSR: TEMPORARY, to be removed
+IF(OCCT_690BETA_COMPAT)
+ADD_DEFINITIONS(-DOCCT_690BETA_COMPAT)
+ENDIF(OCCT_690BETA_COMPAT)
+
 # libraries to link to
 SET(_link_LIBRARIES
   GEOMUtils

diff --git a/src/CurveCreator/CurveCreator_Utils.cxx b/src/CurveCreator/CurveCreator_Utils.cxx
index b8471abe8c215303f8cd5b3f57cfe880ba19c89d..9068bce45f2eefe679ca737df37e8020851005a7 100644 (file)
--- a/src/CurveCreator/CurveCreator_Utils.cxx
+++ b/src/CurveCreator/CurveCreator_Utils.cxx
@@ -582,7 +582,11 @@ void CurveCreator_Utils::setSelectedPoints( Handle(AIS_InteractiveContext) theCo
   for( aSelection->Init(); aSelection->More(); aSelection->Next() )
   {    
 #if OCC_VERSION_LARGE > 0x06080100
+#ifndef OCCT_690BETA_COMPAT // VSR: temporarily, to be removed later and replace below implementation
+    const Handle(SelectMgr_SensitiveEntity) aHSenEntity = aSelection->Sensitive();
+#else                       // #ifndef OCCT_690BETA_COMPAT / VSR: temporarily, to be removed later and replace below implementation
     const SelectMgr_HSensitiveEntity aHSenEntity = aSelection->Sensitive();
+#endif                      // #ifndef OCCT_690BETA_COMPAT / VSR: temporarily, to be removed later and replace below implementation
     if( aHSenEntity.IsNull() )
       continue;
     Handle_SelectBasics_SensitiveEntity aSenEntity = aHSenEntity->BaseSensitive();

diff --git a/src/GEOMGUI/CMakeLists.txt b/src/GEOMGUI/CMakeLists.txt
index 211156716d5258f3f50994f9c608b09834c22584..880562ce382611a97093f1a626dbf4cb16798f15 100755 (executable)
--- a/src/GEOMGUI/CMakeLists.txt
+++ b/src/GEOMGUI/CMakeLists.txt
@@ -50,6 +50,11 @@ ADD_DEFINITIONS(
   ${OPENCV_DEFINITIONS}
   )
 
+# VSR: TEMPORARY, to be removed
+IF(OCCT_690BETA_COMPAT)
+ADD_DEFINITIONS(-DOCCT_690BETA_COMPAT)
+ENDIF(OCCT_690BETA_COMPAT)
+
 # libraries to link to
 SET(_link_LIBRARIES
   GEOMObject

diff --git a/src/GEOMGUI/GEOMGUI_OCCSelector.cxx b/src/GEOMGUI/GEOMGUI_OCCSelector.cxx
index efb4dcd6bea45f89f2aa715ca5fb49a8b421fec7..778ce01f52c455872169dc654892dca46d99cd7b 100644 (file)
--- a/src/GEOMGUI/GEOMGUI_OCCSelector.cxx
+++ b/src/GEOMGUI/GEOMGUI_OCCSelector.cxx
@@ -179,7 +179,11 @@ static void getEntityOwners( const Handle(AIS_InteractiveObject)& theObj,
 
     for ( sel->Init(); sel->More(); sel->Next() ) {
 #if OCC_VERSION_LARGE > 0x06080100
+#ifndef OCCT_690BETA_COMPAT // VSR: temporarily, to be removed later and replace below implementation
+      const Handle(SelectMgr_SensitiveEntity) aHSenEntity = sel->Sensitive();
+#else                       // #ifndef OCCT_690BETA_COMPAT / VSR: temporarily, to be removed later and replace below implementation
       const SelectMgr_HSensitiveEntity aHSenEntity = sel->Sensitive();
+#endif                      // #ifndef OCCT_690BETA_COMPAT / VSR: temporarily, to be removed later and replace below implementation
       if( aHSenEntity.IsNull() )
         continue;
 

diff --git a/src/OBJECT/CMakeLists.txt b/src/OBJECT/CMakeLists.txt
index 60a7497caaa2ef518d931010770104d63812fc79..91e700d0c101dbffa28dafe3ff8935f1957c8b0f 100755 (executable)
--- a/src/OBJECT/CMakeLists.txt
+++ b/src/OBJECT/CMakeLists.txt
@@ -45,6 +45,11 @@ ADD_DEFINITIONS(
   ${QT_DEFINITIONS}
   )
 
+# VSR: TEMPORARY, to be removed
+IF(OCCT_690BETA_COMPAT)
+ADD_DEFINITIONS(-DOCCT_690BETA_COMPAT)
+ENDIF(OCCT_690BETA_COMPAT)
+
 # libraries to link to
 SET(_link_LIBRARIES
   OCC2VTK

diff --git a/src/OBJECT/GEOM_AISShape.cxx b/src/OBJECT/GEOM_AISShape.cxx
index 5415d5373d355dc4429a5323c72ae101f9b81aac..e8989003843b7d48529ae7df7888f44349a37dd3 100644 (file)
--- a/src/OBJECT/GEOM_AISShape.cxx
+++ b/src/OBJECT/GEOM_AISShape.cxx
@@ -109,7 +109,11 @@ static void getEntityOwners( const Handle(AIS_InteractiveObject)& theObj,
 
     for ( sel->Init(); sel->More(); sel->Next() ) {
 #if OCC_VERSION_LARGE > 0x06080100
+#ifndef OCCT_690BETA_COMPAT // VSR: temporarily, to be removed later and replace below implementation
+      const Handle(SelectMgr_SensitiveEntity) aHSenEntity = sel->Sensitive();
+#else                       // #ifndef OCCT_690BETA_COMPAT / VSR: temporarily, to be removed later and replace below implementation
       const SelectMgr_HSensitiveEntity aHSenEntity = sel->Sensitive();
+#endif                      // #ifndef OCCT_690BETA_COMPAT / VSR: temporarily, to be removed later and replace below implementation
       if( aHSenEntity.IsNull() )
         continue;