Merge changes from 'master' branch.

[modules/smesh.git] / src / StdMeshers / StdMeshers_NumberOfSegments.cxx

diff --git a/src/StdMeshers/StdMeshers_NumberOfSegments.cxx b/src/StdMeshers/StdMeshers_NumberOfSegments.cxx
index b26904eb231fef34897c9c5519a5e7c35fd208d1..41ba3495e30f17c3ecc781b061512f91dfdcdca6 100644 (file)
--- a/src/StdMeshers/StdMeshers_NumberOfSegments.cxx
+++ b/src/StdMeshers/StdMeshers_NumberOfSegments.cxx
@@ -42,15 +42,8 @@
 #include <TopExp.hxx>
 #include <TopTools_IndexedMapOfShape.hxx>
 
 #include <TopExp.hxx>
 #include <TopTools_IndexedMapOfShape.hxx>
 

-#if (OCC_VERSION_MAJOR << 16 | OCC_VERSION_MINOR << 8 | OCC_VERSION_MAINTENANCE) > 0x060100
-#define NO_CAS_CATCH
-#endif
-

 #include <Standard_Failure.hxx>
 #include <Standard_Failure.hxx>

-
-#ifdef NO_CAS_CATCH

 #include <Standard_ErrorHandler.hxx>
 #include <Standard_ErrorHandler.hxx>

-#endif

 
 #include <Basics_Utils.hxx>
 
 
 #include <Basics_Utils.hxx>
 


@@ -237,13 +230,10 @@ void StdMeshers_NumberOfSegments::SetTableFunction(const vector<double>& table)
     if( _convMode==0 )
     {
       try {
     if( _convMode==0 )
     {
       try {

-#ifdef NO_CAS_CATCH

         OCC_CATCH_SIGNALS;
         OCC_CATCH_SIGNALS;

-#endif

         val = pow( 10.0, val );
       }
       catch(Standard_Failure) {
         val = pow( 10.0, val );
       }
       catch(Standard_Failure) {

-        Handle(Standard_Failure) aFail = Standard_Failure::Caught();

         throw SALOME_Exception( LOCALIZED( "invalid value"));
         return;
       }
         throw SALOME_Exception( LOCALIZED( "invalid value"));
         return;
       }


@@ -334,13 +324,10 @@ bool process( const TCollection_AsciiString& str, int convMode,
   bool parsed_ok = true;
   Handle( ExprIntrp_GenExp ) myExpr;
   try {
   bool parsed_ok = true;
   Handle( ExprIntrp_GenExp ) myExpr;
   try {

-#ifdef NO_CAS_CATCH

     OCC_CATCH_SIGNALS;
     OCC_CATCH_SIGNALS;

-#endif

     myExpr = ExprIntrp_GenExp::Create();
     myExpr->Process( str.ToCString() );
   } catch(Standard_Failure) {
     myExpr = ExprIntrp_GenExp::Create();
     myExpr->Process( str.ToCString() );
   } catch(Standard_Failure) {

-    Handle(Standard_Failure) aFail = Standard_Failure::Caught();

     parsed_ok = false;
   }
 
     parsed_ok = false;
   }