-// Copyright (C) 2007-2016 CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2021 CEA/DEN, EDF R&D, OPEN CASCADE
//
// Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
#include <Expr_NamedUnknown.hxx>
#include <Expr_GeneralExpression.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>
-#endif
#ifdef WIN32
# include <algorithm>
setAxisScale( myDensity->xAxis(), min_x, max_x );
setAxisScale( myDensity->yAxis(),
-#ifdef WIN32
- min( 0.0, min_y ),
- max( 0.0, max_y )
-#else
std::min( 0.0, min_y ),
std::max( 0.0, max_y )
-#endif
);
myDensity->setSamples( x, y, size );
if( x )
x = y = 0;
try {
-#ifdef NO_CAS_CATCH
OCC_CATCH_SIGNALS;
-#endif
replot();
- } catch(Standard_Failure) {
- Handle(Standard_Failure) aFail = Standard_Failure::Caught();
+ } catch(Standard_Failure&) {
}
}
Kernel_Utils::Localizer loc;
bool parsed_ok = true;
try {
-#ifdef NO_CAS_CATCH
OCC_CATCH_SIGNALS;
-#endif
myExpr = ExprIntrp_GenExp::Create();
myExpr->Process( ( Standard_CString ) str.toLatin1().data() );
- } catch(Standard_Failure) {
- Handle(Standard_Failure) aFail = Standard_Failure::Caught();
+ } catch(Standard_Failure&) {
parsed_ok = false;
}
ok = true;
try {
-#ifdef NO_CAS_CATCH
OCC_CATCH_SIGNALS;
-#endif
res = myExpr->Expression()->Evaluate( myVars, myValues );
- } catch(Standard_Failure) {
- Handle(Standard_Failure) aFail = Standard_Failure::Caught();
+ } catch(Standard_Failure&) {
ok = false;
res = 0.0;
}
case EXPONENT:
{
try {
-#ifdef NO_CAS_CATCH
OCC_CATCH_SIGNALS;
-#endif
// in StdMeshers_NumberOfSegments.cc
// const double PRECISION = 1e-7;
//
if(v < -7) v = -7.0;
v = pow( 10.0, v );
- } catch(Standard_Failure) {
- Handle(Standard_Failure) aFail = Standard_Failure::Caught();
+ } catch(Standard_Failure&) {
v = 0.0;
ok = false;
}