From a22219e0d2fdd82fc14d1f9c0f4cf248f066ccc6 Mon Sep 17 00:00:00 2001 From: jfa Date: Mon, 28 Aug 2006 15:05:30 +0000 Subject: [PATCH] Consider OCCT version --- src/CONVERTOR/VISU_MedConvertor.cxx | 4 +++- src/VISU_I/VISU_Gen_i.cc | 2 ++ src/VISU_I/VISU_TimeAnimation.cxx | 2 ++ 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/src/CONVERTOR/VISU_MedConvertor.cxx b/src/CONVERTOR/VISU_MedConvertor.cxx index 7df59c1e..7fa6c0c3 100644 --- a/src/CONVERTOR/VISU_MedConvertor.cxx +++ b/src/CONVERTOR/VISU_MedConvertor.cxx @@ -1401,7 +1401,9 @@ VISU_MedConvertor #ifndef _DEXCEPT_ try{ - OCC_CATCH_SIGNALS; +#if (OCC_VERSION_MAJOR << 16 | OCC_VERSION_MINOR << 8 | OCC_VERSION_MAINTENANCE) > 0x060100 + OCC_CATCH_SIGNALS; +#endif #endif MED::PTimeStampInfo aTimeStampInfo = aMed->GetPTimeStampInfo(aFieldInfo, aMEntity, diff --git a/src/VISU_I/VISU_Gen_i.cc b/src/VISU_I/VISU_Gen_i.cc index ca54a2f6..0540ad5c 100644 --- a/src/VISU_I/VISU_Gen_i.cc +++ b/src/VISU_I/VISU_Gen_i.cc @@ -243,7 +243,9 @@ namespace VISU { #ifndef _DEXCEPT_ try{ +#if (OCC_VERSION_MAJOR << 16 | OCC_VERSION_MINOR << 8 | OCC_VERSION_MAINTENANCE) > 0x060100 OCC_CATCH_SIGNALS; +#endif #endif if(theColoredPrs3d->Create(theMeshName,theEntity,theFieldName,int(theIteration))) return true; diff --git a/src/VISU_I/VISU_TimeAnimation.cxx b/src/VISU_I/VISU_TimeAnimation.cxx index ce7b42ad..410a432e 100644 --- a/src/VISU_I/VISU_TimeAnimation.cxx +++ b/src/VISU_I/VISU_TimeAnimation.cxx @@ -238,7 +238,9 @@ namespace bool anIsCreated = false; TPrs3d* aPresent = new TPrs3d(theResult, false); try{ +#if (OCC_VERSION_MAJOR << 16 | OCC_VERSION_MINOR << 8 | OCC_VERSION_MAINTENANCE) > 0x060100 OCC_CATCH_SIGNALS; +#endif if(aPresent->Create(aMeshName.latin1(),anEntity,aFieldName.latin1(),aTimeStampId)){ anIsCreated = true; theData.myPrs[aFrameId++] = aPresent; -- 2.39.2