Usage of CASCatch with old OCCT versions.

diff --git a/src/CONVERTOR/VISU_MedConvertor.cxx b/src/CONVERTOR/VISU_MedConvertor.cxx
index 7fa6c0c3cefd489c586475cbbe1fc67611f9cb40..77c4351bc672620c0e6db9983e9131a193178822 100644 (file)
--- a/src/CONVERTOR/VISU_MedConvertor.cxx
+++ b/src/CONVERTOR/VISU_MedConvertor.cxx
@@ -34,8 +34,17 @@
 #include "MED_GaussUtils.hxx"
 #include "MED_Utilities.hxx"
 
+#if (OCC_VERSION_MAJOR << 16 | OCC_VERSION_MINOR << 8 | OCC_VERSION_MAINTENANCE) > 0x060100
+#define NO_CAS_CATCH
+#endif
+
 #include <Standard_Failure.hxx>
+
+#ifdef NO_CAS_CATCH
 #include <Standard_ErrorHandler.hxx>
+#else
+#include "CASCatch.hxx"
+#endif
 
 #include <vtkCellType.h>
 
@@ -1400,9 +1409,12 @@ VISU_MedConvertor
            INITMSG(MYDEBUG,"- iTimeStamp = "<<iTimeStamp<<endl);
            
 #ifndef _DEXCEPT_
+#ifdef NO_CAS_CATCH
             try{
-#if (OCC_VERSION_MAJOR << 16 | OCC_VERSION_MINOR << 8 | OCC_VERSION_MAINTENANCE) > 0x060100
               OCC_CATCH_SIGNALS;
+#else
+            CASCatch_TRY{
+              try{
 #endif
 #endif
                MED::PTimeStampInfo aTimeStampInfo = aMed->GetPTimeStampInfo(aFieldInfo,
@@ -1473,6 +1485,7 @@ VISU_MedConvertor
                  }
                }
 #ifndef _DEXCEPT_
+#ifdef NO_CAS_CATCH
               }catch(Standard_Failure){
                Handle(Standard_Failure) aFail = Standard_Failure::Caught();          
                MSG(MYDEBUG,"Follow signal was occured in:\n"<<aFail->GetMessageString());
@@ -1481,6 +1494,17 @@ VISU_MedConvertor
              }catch(...){
                MSG(MYDEBUG,"Unknown exception !!!");
              }
+#else
+             }catch(std::exception& exc){
+               MSG(MYDEBUG,"Follow exception was occured in:\n"<<exc.what());
+             }catch(...){
+               MSG(MYDEBUG,"Unknown exception !!!");
+             }
+            }CASCatch_CATCH(Standard_Failure){
+              Handle(Standard_Failure) aFail = Standard_Failure::Caught();          
+              MSG(MYDEBUG,"Follow signal was occured in:\n"<<aFail->GetMessageString());
+            }
+#endif
 #endif
          }
          for(TInt iComp = 0; iComp <= aNbComp; iComp++){

diff --git a/src/VISU_I/VISU_Gen_i.cc b/src/VISU_I/VISU_Gen_i.cc
index 0540ad5ccfe5b2ccdde28f7311c3e87231a864d0..ae642d9779dd273c0c11301eff571414eb794f6d 100644 (file)
--- a/src/VISU_I/VISU_Gen_i.cc
+++ b/src/VISU_I/VISU_Gen_i.cc
@@ -86,8 +86,17 @@
 
 #include "Utils_ExceptHandlers.hxx"
 
+#if (OCC_VERSION_MAJOR << 16 | OCC_VERSION_MINOR << 8 | OCC_VERSION_MAINTENANCE) > 0x060100
+#define NO_CAS_CATCH
+#endif
+
 #include <Standard_Failure.hxx>
+
+#ifdef NO_CAS_CATCH
 #include <Standard_ErrorHandler.hxx>
+#else
+#include "CASCatch.hxx"
+#endif
 
 using namespace std;
 
@@ -242,22 +251,37 @@ namespace VISU
                    CORBA::Double theIteration)
   {
 #ifndef _DEXCEPT_
+#ifdef NO_CAS_CATCH
     try{
-#if (OCC_VERSION_MAJOR << 16 | OCC_VERSION_MINOR << 8 | OCC_VERSION_MAINTENANCE) > 0x060100
       OCC_CATCH_SIGNALS;
+#else
+    CASCatch_TRY{
+      try{
 #endif
 #endif
-      if(theColoredPrs3d->Create(theMeshName,theEntity,theFieldName,int(theIteration)))
-       return true;
+       if(theColoredPrs3d->Create(theMeshName,theEntity,theFieldName,int(theIteration)))
+         return true;
 #ifndef _DEXCEPT_
-    }catch(Standard_Failure) {
-      Handle(Standard_Failure) aFail = Standard_Failure::Caught();
+#ifdef NO_CAS_CATCH
+      }catch(Standard_Failure) {
+       Handle(Standard_Failure) aFail = Standard_Failure::Caught();
+       INFOS("Follow signal was occured :\n"<<aFail->GetMessageString());
+      }catch(std::exception& exc){
+       INFOS("Follow exception was occured :\n"<<exc.what());
+      }catch(...){
+       INFOS("Unknown exception was occured!");
+      }
+#else
+      }catch(std::exception& exc){
+       INFOS("Follow exception was occured :\n"<<exc.what());
+      }catch(...){
+       INFOS("Unknown exception was occured!");
+      }
+    }CASCatch_CATCH(Standard_Failure){
+      Handle(Standard_Failure) aFail = Standard_Failure::Caught();          
       INFOS("Follow signal was occured :\n"<<aFail->GetMessageString());
-    }catch(std::exception& exc){
-      INFOS("Follow exception was occured :\n"<<exc.what());
-    }catch(...){
-      INFOS("Unknown exception was occured!");
     }
+#endif
 #endif
     return false;
   }

diff --git a/src/VISU_I/VISU_TimeAnimation.cxx b/src/VISU_I/VISU_TimeAnimation.cxx
index 410a432e596d4ea63c2a29e9d43aa9894e66b935..5faacca8d429b41547d7a6cc7a2176acf1cfda6b 100644 (file)
--- a/src/VISU_I/VISU_TimeAnimation.cxx
+++ b/src/VISU_I/VISU_TimeAnimation.cxx
@@ -58,14 +58,23 @@
 #include "SALOMEDSClient_AttributeComment.hxx"
 #include "SALOMEDSClient_AttributeName.hxx"
 
-#include <Standard_Failure.hxx>
-#include <Standard_ErrorHandler.hxx>
-
 #include <qpixmap.h>
 #include <qimage.h>
 #include <qstrlist.h>
 #include <qdir.h>
 
+#if (OCC_VERSION_MAJOR << 16 | OCC_VERSION_MINOR << 8 | OCC_VERSION_MAINTENANCE) > 0x060100
+#define NO_CAS_CATCH
+#endif
+
+#include <Standard_Failure.hxx>
+
+#ifdef NO_CAS_CATCH
+#include <Standard_ErrorHandler.hxx>
+#else
+#include "CASCatch.hxx"
+#endif
+
 using namespace std;
 
 
@@ -237,24 +246,39 @@ namespace
       
       bool anIsCreated = false;
       TPrs3d* aPresent = new TPrs3d(theResult, false);
+#ifdef NO_CAS_CATCH
       try{       
-#if (OCC_VERSION_MAJOR << 16 | OCC_VERSION_MINOR << 8 | OCC_VERSION_MAINTENANCE) > 0x060100
         OCC_CATCH_SIGNALS;
+#else
+      CASCatch_TRY{
+        try{
 #endif
-       if(aPresent->Create(aMeshName.latin1(),anEntity,aFieldName.latin1(),aTimeStampId)){
-         anIsCreated = true;
-         theData.myPrs[aFrameId++] = aPresent;
-         aMin = std::min(aPresent->GetMin(), aMin);
-         aMax = std::max(aPresent->GetMax(), aMax);
-       }
-      }catch(Standard_Failure) {
-       Handle(Standard_Failure) aFail = Standard_Failure::Caught();
-       INFOS("Follow signal was occured :\n"<<aFail->GetMessageString());
-      }catch(std::exception& exc){
-       INFOS("Follow exception was occured :\n"<<exc.what());
-      }catch(...){
-       INFOS("Unknown exception was occured!");
+          if(aPresent->Create(aMeshName.latin1(),anEntity,aFieldName.latin1(),aTimeStampId)){
+            anIsCreated = true;
+            theData.myPrs[aFrameId++] = aPresent;
+            aMin = std::min(aPresent->GetMin(), aMin);
+            aMax = std::max(aPresent->GetMax(), aMax);
+          }
+#ifdef NO_CAS_CATCH
+        }catch(Standard_Failure) {
+          Handle(Standard_Failure) aFail = Standard_Failure::Caught();
+          INFOS("Follow signal was occured :\n"<<aFail->GetMessageString());
+        }catch(std::exception& exc){
+          INFOS("Follow exception was occured :\n"<<exc.what());
+        }catch(...){
+          INFOS("Unknown exception was occured!");
+        }
+#else
+        }catch(std::exception& exc){
+          INFOS("Follow exception was occured :\n"<<exc.what());
+        }catch(...){
+          INFOS("Unknown exception was occured!");
+        }
+      }CASCatch_CATCH(Standard_Failure){
+        Handle(Standard_Failure) aFail = Standard_Failure::Caught();          
+        INFOS("Follow signal was occured :\n"<<aFail->GetMessageString());
       }
+#endif
       if(!anIsCreated)
        aPresent->_remove_ref();
     }