StdSelect_BRepSelectionTool::GetSensitiveForFace() - add missing check for an empty sequence

Remove No_Standard_* macros defined within .cxx files.
Added building option OCCT_DEBUG_SANITIZE_EXCEPTIONS for performing expensive checks
2025-08-14 13:30:48 +03:00 · 2019-03-24 10:32:05 +03:00 · 2019-03-24 10:32:05 +03:00 · 2019-03-24 10:32:04 +03:00 · 2019-03-24 10:32:04 +03:00 · 2019-03-24 10:32:04 +03:00
137 changed files with 104 additions and 827 deletions
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -91,6 +91,17 @@ if (NOT DEFINED BUILD_RELEASE_DISABLE_EXCEPTIONS)
  set (BUILD_RELEASE_DISABLE_EXCEPTIONS ON CACHE BOOL "${BUILD_RELEASE_DISABLE_EXCEPTIONS_DESCR}")
 endif()

+# option enabling extra exceptions (OCCT_DEBUG_SANITIZE_EXCEPTIONS)
+if (NOT DEFINED BUILD_ENABLE_SANITIZE_EXCEPTIONS)
+  set (BUILD_ENABLE_SANITIZE_EXCEPTIONS OFF CACHE BOOL "${BUILD_ENABLE_SANITIZE_EXCEPTIONS_DESCR}")
+endif()
+
+if (BUILD_ENABLE_SANITIZE_EXCEPTIONS)
+  add_definitions (-DOCCT_DEBUG_SANITIZE_EXCEPTIONS)
+endif()
+# DEBUG
+add_definitions (-DOCCT_DEBUG_SANITIZE_EXCEPTIONS)
+
 # option to enable or disable use of precompiled headers
 if (NOT DEFINED BUILD_USE_PCH)
  set (BUILD_USE_PCH OFF CACHE BOOL "${BUILD_USE_PCH_DESCR}")
--- a/adm/cmake/occt_defs_flags.cmake
+++ b/adm/cmake/occt_defs_flags.cmake
@@ -144,6 +144,6 @@ if (CMAKE_COMPILER_IS_GNUCC OR CMAKE_COMPILER_IS_GNUCXX OR MINGW)
 endif()

 if (BUILD_RELEASE_DISABLE_EXCEPTIONS)
-  set (CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -DNo_Exception")
-  set (CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} -DNo_Exception")
+  #set (CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -DNo_Exception")
+  #set (CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} -DNo_Exception")
 endif()
--- a/adm/cmake/vardescr.cmake
+++ b/adm/cmake/vardescr.cmake
@@ -33,6 +33,10 @@ set (BUILD_RELEASE_DISABLE_EXCEPTIONS_DESCR
 Defines No_Exception macros for Release builds when enabled (default).
 These exceptions are always enabled in Debug builds, but disable in Release for better performance")

+set (BUILD_ENABLE_SANITIZE_EXCEPTIONS_DESCR
+"Enables extra exceptions for detecting broken code. Should NOT be used for production.
+Defines OCCT_DEBUG_SANITIZE_EXCEPTIONS macros when enabled (OFF by default).")
+
 set (BUILD_ENABLE_FPE_SIGNAL_HANDLER_DESCR
 "Enable/Disable the floating point exceptions (FPE) during DRAW execution only.
 Corresponding environment variable (CSF_FPE) can be changed manually
--- a/src/Adaptor3d/Adaptor3d_CurveOnSurface.cxx
+++ b/src/Adaptor3d/Adaptor3d_CurveOnSurface.cxx
@@ -11,9 +11,6 @@
 // Alternatively, this file may be used under the terms of Open CASCADE
 // commercial license or contractual agreement.

-#define No_Standard_OutOfRange
-
-
 #include <Adaptor2d_HCurve2d.hxx>
 #include <Adaptor3d_CurveOnSurface.hxx>
 #include <Adaptor3d_HCurve.hxx>
--- a/src/AdvApprox/AdvApprox_SimpleApprox.cxx
+++ b/src/AdvApprox/AdvApprox_SimpleApprox.cxx
@@ -12,10 +12,6 @@
 // Alternatively, this file may be used under the terms of Open CASCADE
 // commercial license or contractual agreement.

-#define No_Standard_RangeError
-#define No_Standard_OutOfRange
-
-
 #include <AdvApprox_EvaluatorFunction.hxx>
 #include <AdvApprox_SimpleApprox.hxx>
 #include <math_Vector.hxx>
--- a/src/AppCont/AppCont_ContMatrices.cxx
+++ b/src/AppCont/AppCont_ContMatrices.cxx
@@ -14,12 +14,6 @@
 // Alternatively, this file may be used under the terms of Open CASCADE
 // commercial license or contractual agreement.

-#ifndef OCCT_DEBUG
-#define No_Standard_OutOfRange
-#define No_Standard_RangeError
-#endif
-
-
 #include <AppCont_ContMatrices.hxx>
 #include <math_Matrix.hxx>
 #include <Standard_DimensionError.hxx>
--- a/src/AppCont/AppCont_ContMatrices_1.cxx
+++ b/src/AppCont/AppCont_ContMatrices_1.cxx
@@ -14,11 +14,6 @@
 // Alternatively, this file may be used under the terms of Open CASCADE
 // commercial license or contractual agreement.

-#ifndef OCCT_DEBUG
-#define No_Standard_OutOfRange
-#define No_Standard_RangeError
-#endif
-
 #include <AppCont_ContMatrices.hxx>
 #include <math_Matrix.hxx>
 #include <Standard_DimensionError.hxx>
--- a/src/AppCont/AppCont_ContMatrices_2.cxx
+++ b/src/AppCont/AppCont_ContMatrices_2.cxx
@@ -14,12 +14,6 @@
 // Alternatively, this file may be used under the terms of Open CASCADE
 // commercial license or contractual agreement.

-#ifndef OCCT_DEBUG
-#define No_Standard_OutOfRange
-#define No_Standard_RangeError
-#endif
-
-
 #include <AppCont_ContMatrices.hxx>
 #include <math_Matrix.hxx>
 #include <Standard_DimensionError.hxx>
--- a/src/AppCont/AppCont_ContMatrices_3.cxx
+++ b/src/AppCont/AppCont_ContMatrices_3.cxx
@@ -14,11 +14,6 @@
 // Alternatively, this file may be used under the terms of Open CASCADE
 // commercial license or contractual agreement.

-#ifndef OCCT_DEBUG
-#define No_Standard_OutOfRange
-#define No_Standard_RangeError
-#endif
-
 #include <AppCont_ContMatrices.hxx>
 #include <math_Matrix.hxx>
 #include <Standard_DimensionError.hxx>
--- a/src/AppCont/AppCont_ContMatrices_4.cxx
+++ b/src/AppCont/AppCont_ContMatrices_4.cxx
@@ -14,11 +14,6 @@
 // Alternatively, this file may be used under the terms of Open CASCADE
 // commercial license or contractual agreement.

-#ifndef OCCT_DEBUG
-#define No_Standard_OutOfRange
-#define No_Standard_RangeError
-#endif
-
 #include <AppCont_ContMatrices.hxx>
 #include <math_Matrix.hxx>
 #include <Standard_DimensionError.hxx>
--- a/src/AppCont/AppCont_LeastSquare.cxx
+++ b/src/AppCont/AppCont_LeastSquare.cxx
@@ -14,10 +14,6 @@
 // Alternatively, this file may be used under the terms of Open CASCADE
 // commercial license or contractual agreement.

-#ifndef OCCT_DEBUG
-#define No_Standard_OutOfRange
-#define No_Standard_RangeError
-#endif
 #include <AppCont_LeastSquare.hxx>

 #include <math.hxx>
--- a/src/AppDef/AppDef_Variational.cxx
+++ b/src/AppDef/AppDef_Variational.cxx
@@ -32,11 +32,6 @@
 #include <Standard_OutOfRange.hxx>
 #include <StdFail_NotDone.hxx>

-#define No_Standard_RangeError
-#define No_Standard_OutOfRange
-#define No_Standard_DimensionError
-#define No_Standard_ConstructionError
-
 #include <Standard_Stream.hxx>

 #include <AppParCurves.hxx>
--- a/src/AppParCurves/AppParCurves.cxx
+++ b/src/AppParCurves/AppParCurves.cxx
@@ -12,10 +12,6 @@
 // Alternatively, this file may be used under the terms of Open CASCADE
 // commercial license or contractual agreement.

-#define No_Standard_RangeError
-#define No_Standard_OutOfRange
-
-
 #include <AppParCurves.hxx>
 #include <BSplCLib.hxx>
 #include <gp_Pnt2d.hxx>
--- a/src/AppParCurves/AppParCurves_BSpGradient.gxx
+++ b/src/AppParCurves/AppParCurves_BSpGradient.gxx
@@ -20,10 +20,6 @@
 // La methode de gradient conjugue est programmee dans la bibliotheque 
 // mathematique: math_BFGS.

-
-#define No_Standard_RangeError
-#define No_Standard_OutOfRange
-
 #include <AppParCurves_Constraint.hxx>
 #include <AppParCurves_ConstraintCouple.hxx>
 #include <math_BFGS.hxx>
--- a/src/AppParCurves/AppParCurves_Function.gxx
+++ b/src/AppParCurves/AppParCurves_Function.gxx
@@ -20,11 +20,6 @@
 // DF(ui, Poles(ui)) ce qui implique un calcul des nouveaux poles 
 //  a chaque appel.

-#define No_Standard_RangeError
-#define No_Standard_OutOfRange
-
-
-
 #include <AppParCurves_MultiCurve.hxx>
 #include <AppParCurves_MultiPoint.hxx>
 #include <TColStd_HArray1OfInteger.hxx>
--- a/src/AppParCurves/AppParCurves_Gradient.gxx
+++ b/src/AppParCurves/AppParCurves_Gradient.gxx
@@ -25,10 +25,6 @@
 // Si ce n est pas le cas, l appel a ResConstraint est equivalent a une 
 // seconde resolution par les moindres carres donc beaucoup de temps perdu.

-
-#define No_Standard_RangeError
-#define No_Standard_OutOfRange
-
 #include <AppParCurves_Constraint.hxx>
 #include <math_BFGS.hxx>
 #include <StdFail_NotDone.hxx>
--- a/src/AppParCurves/AppParCurves_LeastSquare.gxx
+++ b/src/AppParCurves/AppParCurves_LeastSquare.gxx
@@ -19,11 +19,6 @@
 // Ce programme utilise les moindres carres pour le cas suivant:
 // passage et tangences aux extremites.

-
-#define No_Standard_RangeError
-#define No_Standard_OutOfRange
-#define No_Standard_DimensionError
-
 #include <math_Householder.hxx>
 #include <math_Crout.hxx>
 #include <AppParCurves.hxx>
--- a/src/AppParCurves/AppParCurves_ResolConstraint.gxx
+++ b/src/AppParCurves/AppParCurves_ResolConstraint.gxx
@@ -19,9 +19,6 @@
 // solution approchee (MultiCurve). L algorithme utilise est l algorithme 
 // d Uzawa du package mathematique.

-#define No_Standard_RangeError
-#define No_Standard_OutOfRange
-
 #include <math_Vector.hxx>
 #include <math_Matrix.hxx>
 #include <AppParCurves_Constraint.hxx>
--- a/src/BRepTopAdaptor/BRepTopAdaptor_FClass2d.cxx
+++ b/src/BRepTopAdaptor/BRepTopAdaptor_FClass2d.cxx
@@ -16,9 +16,6 @@

 #define AFFICHAGE 0

-#define No_Standard_OutOfRange
-
-
 #include <BRep_Tool.hxx>
 #include <BRepAdaptor_Curve.hxx>
 #include <BRepAdaptor_Curve2d.hxx>
--- a/src/BSplCLib/BSplCLib_BzSyntaxes.cxx
+++ b/src/BSplCLib/BSplCLib_BzSyntaxes.cxx
@@ -18,9 +18,6 @@
 #include <TColStd_Array1OfInteger.hxx>
 #include <TColStd_Array1OfReal.hxx>

-#define No_Standard_RangeError
-#define No_Standard_OutOfRange
-
 //=======================================================================
 //struct : BSplCLib_BezierArrays 
 //purpose: Auxiliary structure providing standard definitions of bspline 
--- a/src/BSplSLib/BSplSLib_BzSyntaxes.cxx
+++ b/src/BSplSLib/BSplSLib_BzSyntaxes.cxx
@@ -14,12 +14,6 @@
 // Alternatively, this file may be used under the terms of Open CASCADE
 // commercial license or contractual agreement.

-//  pmn  16-10-96 : Correction de PolesCoefficient (PRO5782)
-//                  ColLength et RowLength avaient encore frappes !!
-
-#define No_Standard_RangeError
-#define No_Standard_OutOfRange
-
 #include <BSplSLib.hxx>
 #include <BSplCLib.hxx>
 #include <TColStd_Array1OfReal.hxx>
--- a/src/CSLib/CSLib_Class2d.cxx
+++ b/src/CSLib/CSLib_Class2d.cxx
@@ -14,8 +14,6 @@
 // Alternatively, this file may be used under the terms of Open CASCADE
 // commercial license or contractual agreement.

-//#define No_Standard_OutOfRange
-
 #include <CSLib_Class2d.hxx>
 #include <gp_Pnt2d.hxx>
 #include <Standard_ConstructionError.hxx>
--- a/src/Convert/Convert_CompPolynomialToPoles.cxx
+++ b/src/Convert/Convert_CompPolynomialToPoles.cxx
@@ -22,9 +22,6 @@
 // 15-04-97 : PMN : Constructeurs avec un seul segement ou differentes 
 //                  continuitees. 

-#define No_Standard_OutOfRange
-
-
 #include <BSplCLib.hxx>
 #include <Convert_CompPolynomialToPoles.hxx>
 #include <PLib.hxx>
--- a/src/Convert/Convert_ConicToBSplineCurve.cxx
+++ b/src/Convert/Convert_ConicToBSplineCurve.cxx
@@ -12,11 +12,6 @@
 // Alternatively, this file may be used under the terms of Open CASCADE
 // commercial license or contractual agreement.

-//JCV 16/10/91
-
-#define No_Standard_OutOfRange
-
-
 #include <BSplCLib.hxx>
 #include <Convert_ConicToBSplineCurve.hxx>
 #include <Convert_CosAndSinEvalFunction.hxx>
--- a/src/Draw/Draw_Interpretor.cxx
+++ b/src/Draw/Draw_Interpretor.cxx
@@ -112,16 +112,7 @@ namespace {

 } // anonymous namespace

-// MKV 29.03.05
-#if ((TCL_MAJOR_VERSION > 8) || ((TCL_MAJOR_VERSION == 8) && (TCL_MINOR_VERSION >= 4))) && !defined(USE_NON_CONST)
-static Standard_Integer CommandCmd 
-(ClientData theClientData, Tcl_Interp *interp,
- Standard_Integer argc, const char* argv[])
-#else
-static Standard_Integer CommandCmd 
-(ClientData theClientData, Tcl_Interp *interp,
- Standard_Integer argc, char* argv[])
-#endif
+static Standard_Integer CommandCmd (ClientData theClientData, Tcl_Interp* interp, Standard_Integer argc, const char* argv[])
 {
  static Standard_Integer code;
  code = TCL_OK;
@@ -166,18 +157,10 @@ static Standard_Integer CommandCmd
  }
  catch (Standard_Failure const& anException) {
    // fail if Draw_ExitOnCatch is set
-    // MKV 29.03.05
-#if ((TCL_MAJOR_VERSION > 8) || ((TCL_MAJOR_VERSION == 8) && (TCL_MINOR_VERSION >= 4))) && !defined(USE_NON_CONST)
-    const char*  cc = Tcl_GetVar(interp,
-			  "Draw_ExitOnCatch",TCL_GLOBAL_ONLY);
-#else
-    char* const cc = Tcl_GetVar(interp,
-			  "Draw_ExitOnCatch",TCL_GLOBAL_ONLY);
-#endif
-
-    cout << "An exception was caught " << anException << endl;
-
-    if (cc && Draw::Atoi(cc)) {
+    std::cout << "An exception was caught " << anException << std::endl;
+    const char* toExitOnCatch = Tcl_GetVar (interp, "Draw_ExitOnCatch", TCL_GLOBAL_ONLY);
+    if (toExitOnCatch != NULL && Draw::Atoi (toExitOnCatch))
+    {
 #ifdef _WIN32
      Tcl_Exit(0);
 #else      
@@ -191,6 +174,44 @@ static Standard_Integer CommandCmd
    Tcl_SetResult(interp,(char*)(ss.str().c_str()),TCL_VOLATILE);
    code = TCL_ERROR;
  }
+  catch (std::exception& theStdException)
+  {
+    std::cout << "An exception was caught " << theStdException.what() << " [" << typeid(theStdException).name() << "]" << std::endl;
+    const char* toExitOnCatch = Tcl_GetVar (interp, "Draw_ExitOnCatch", TCL_GLOBAL_ONLY);
+    if (toExitOnCatch != NULL && Draw::Atoi (toExitOnCatch))
+    {
+    #ifdef _WIN32
+      Tcl_Exit (0);
+    #else
+      Tcl_Eval (interp, "exit");
+    #endif
+    }
+
+    // get the error message
+    Standard_SStream ss;
+    ss << "** Exception ** " << theStdException.what() << " [" << typeid(theStdException).name() << "]" << ends;
+    Tcl_SetResult (interp, (char*)(ss.str().c_str()), TCL_VOLATILE);
+    code = TCL_ERROR;
+  }
+  catch (...)
+  {
+    std::cout << "UNKNOWN exception was caught " << std::endl;
+    const char* toExitOnCatch = Tcl_GetVar (interp, "Draw_ExitOnCatch", TCL_GLOBAL_ONLY);
+    if (toExitOnCatch != NULL && Draw::Atoi (toExitOnCatch))
+    {
+    #ifdef _WIN32
+      Tcl_Exit (0);
+    #else
+      Tcl_Eval (interp,"exit");
+    #endif
+    }
+
+    // get the error message
+    Standard_SStream ss;
+    ss << "** Exception ** UNKNOWN" << ends;
+    Tcl_SetResult (interp, (char* )(ss.str().c_str()), TCL_VOLATILE);
+    code = TCL_ERROR;
+  }

  // log command result
  if (doLog || doEcho)
--- a/src/Draw/Draw_Window.cxx
+++ b/src/Draw/Draw_Window.cxx
@@ -72,26 +72,16 @@ void Draw_Window::RemoveCallbackBeforeTerminate(FCallbackBeforeTerminate theCB)

 static void Prompt(Tcl_Interp *Interp, int partial)
 {
-
-  // MKV 29.03.05
-#if ((TCL_MAJOR_VERSION > 8) || ((TCL_MAJOR_VERSION == 8) && (TCL_MINOR_VERSION >= 4))) && !defined(USE_NON_CONST)
-    const char *promptCmd;
-#else
-    char *promptCmd;
-#endif
-    int code;
-    Tcl_Channel  outChannel, errChannel;
-    outChannel = Tcl_GetStdChannel(TCL_STDOUT);
-    promptCmd = Tcl_GetVar(Interp,(char*)
-        (partial ? "tcl_prompt2" : "tcl_prompt1"), TCL_GLOBAL_ONLY);
-
+    Tcl_Channel errChannel;
+    Tcl_Channel outChannel = Tcl_GetStdChannel(TCL_STDOUT);
+    const char* promptCmd = Tcl_GetVar (Interp, partial ? "tcl_prompt2" : "tcl_prompt1", TCL_GLOBAL_ONLY);
    if (promptCmd == NULL) {
 defaultPrompt:
      if (!partial && outChannel) {
        Tcl_Write(outChannel, "% ", 2);
      }
    } else {
-      code = Tcl_Eval(Interp, promptCmd);
+      int code = Tcl_Eval(Interp, promptCmd);
      outChannel = Tcl_GetStdChannel(TCL_STDOUT);
      errChannel = Tcl_GetStdChannel(TCL_STDERR);
      if (code != TCL_OK) {
--- a/src/ElCLib/ElCLib.cxx
+++ b/src/ElCLib/ElCLib.cxx
@@ -14,13 +14,6 @@
 // Alternatively, this file may be used under the terms of Open CASCADE
 // commercial license or contractual agreement.

-// Evolutions   JCV Dec 1991 ajout de calculs de derivees et traitement
-//              d'entites 2d
-//              JCV Mars 1992 ajout method SetLinearForm
-
-#define No_Standard_OutOfRange
-
-
 #include <ElCLib.hxx>
 #include <gp.hxx>
 #include <gp_Ax1.hxx>
--- a/src/ElSLib/ElSLib.cxx
+++ b/src/ElSLib/ElSLib.cxx
@@ -14,15 +14,8 @@
 // Alternatively, this file may be used under the terms of Open CASCADE
 // commercial license or contractual agreement.

-//  Modified by skv - Tue Sep  9 15:10:35 2003 OCC620
-
-
-#ifndef No_Exception
-#define No_Exception
-#endif
-
-
 #include <ElSLib.hxx>
+
 #include <gp.hxx>
 #include <gp_Ax3.hxx>
 #include <gp_Circ.hxx>
--- a/src/Expr/Expr_BinaryFunction.cxx
+++ b/src/Expr/Expr_BinaryFunction.cxx
@@ -14,12 +14,6 @@
 // Alternatively, this file may be used under the terms of Open CASCADE
 // commercial license or contractual agreement.

-#ifndef OCCT_DEBUG
-#define No_Standard_RangeError
-#define No_Standard_OutOfRange
-#endif
-
-
 #include <Expr.hxx>
 #include <Expr_Array1OfGeneralExpression.hxx>
 #include <Expr_Array1OfNamedUnknown.hxx>
--- a/src/Expr/Expr_PolyFunction.cxx
+++ b/src/Expr/Expr_PolyFunction.cxx
@@ -14,12 +14,6 @@
 // Alternatively, this file may be used under the terms of Open CASCADE
 // commercial license or contractual agreement.

-#ifndef OCCT_DEBUG
-#define No_Standard_RangeError
-#define No_Standard_OutOfRange
-#endif
-
-
 #include <Expr.hxx>
 #include <Expr_Array1OfNamedUnknown.hxx>
 #include <Expr_FunctionDerivative.hxx>
--- a/src/Expr/Expr_Product.cxx
+++ b/src/Expr/Expr_Product.cxx
@@ -14,12 +14,6 @@
 // Alternatively, this file may be used under the terms of Open CASCADE
 // commercial license or contractual agreement.

-#ifndef OCCT_DEBUG
-#define No_Standard_RangeError
-#define No_Standard_OutOfRange
-#endif
-
-
 #include <Expr.hxx>
 #include <Expr_GeneralExpression.hxx>
 #include <Expr_NamedUnknown.hxx>
--- a/src/Expr/Expr_Sum.cxx
+++ b/src/Expr/Expr_Sum.cxx
@@ -14,12 +14,6 @@
 // Alternatively, this file may be used under the terms of Open CASCADE
 // commercial license or contractual agreement.

-#ifndef OCCT_DEBUG
-#define No_Standard_RangeError
-#define No_Standard_OutOfRange
-#endif
-
-
 #include <Expr.hxx>
 #include <Expr_GeneralExpression.hxx>
 #include <Expr_NamedUnknown.hxx>
--- a/src/Expr/Expr_UnaryFunction.cxx
+++ b/src/Expr/Expr_UnaryFunction.cxx
@@ -14,12 +14,6 @@
 // Alternatively, this file may be used under the terms of Open CASCADE
 // commercial license or contractual agreement.

-#ifndef OCCT_DEBUG
-#define No_Standard_RangeError
-#define No_Standard_OutOfRange
-#endif
-
-
 #include <Expr.hxx>
 #include <Expr_Array1OfGeneralExpression.hxx>
 #include <Expr_Array1OfNamedUnknown.hxx>
--- a/src/FEmTool/FEmTool_Curve.cxx
+++ b/src/FEmTool/FEmTool_Curve.cxx
@@ -14,10 +14,6 @@
 // Alternatively, this file may be used under the terms of Open CASCADE
 // commercial license or contractual agreement.

-#define No_Standard_RangeError
-#define No_Standard_OutOfRange
-
-
 #include <FEmTool_Curve.hxx>
 #include <PLib.hxx>
 #include <PLib_Base.hxx>
--- a/src/FEmTool/FEmTool_ProfileMatrix.cxx
+++ b/src/FEmTool/FEmTool_ProfileMatrix.cxx
@@ -14,11 +14,6 @@
 // Alternatively, this file may be used under the terms of Open CASCADE
 // commercial license or contractual agreement.

-#define No_Standard_RangeError
-#define No_Standard_OutOfRange
-#define No_Standard_DimensionError
-
-
 #include <FEmTool_ProfileMatrix.hxx>
 #include <gp.hxx>
 #include <Standard_NotImplemented.hxx>
--- a/src/FairCurve/FairCurve_Batten.cxx
+++ b/src/FairCurve/FairCurve_Batten.cxx
@@ -14,12 +14,6 @@
 // Alternatively, this file may be used under the terms of Open CASCADE
 // commercial license or contractual agreement.

-#ifndef OCCT_DEBUG
-#define No_Standard_RangeError
-#define No_Standard_OutOfRange
-#endif
-
-
 #include <BSplCLib.hxx>
 #include <FairCurve_Batten.hxx>
 #include <FairCurve_BattenLaw.hxx>
--- a/src/FairCurve/FairCurve_DistributionOfJerk.cxx
+++ b/src/FairCurve/FairCurve_DistributionOfJerk.cxx
@@ -14,14 +14,6 @@
 // Alternatively, this file may be used under the terms of Open CASCADE
 // commercial license or contractual agreement.

-// 01-04-1996 : PMN Version originale
-
-#ifndef OCCT_DEBUG
-#define No_Standard_RangeError
-#define No_Standard_OutOfRange
-#endif
-
-
 #include <BSplCLib.hxx>
 #include <FairCurve_BattenLaw.hxx>
 #include <FairCurve_DistributionOfJerk.hxx>
--- a/src/FairCurve/FairCurve_DistributionOfSagging.cxx
+++ b/src/FairCurve/FairCurve_DistributionOfSagging.cxx
@@ -11,14 +11,6 @@
 // Alternatively, this file may be used under the terms of Open CASCADE
 // commercial license or contractual agreement.

-// 09-02-1996 : PMN Version originale
-
-#ifndef OCCT_DEBUG
-#define No_Standard_RangeError
-#define No_Standard_OutOfRange
-#endif
-
-
 #include <BSplCLib.hxx>
 #include <FairCurve_BattenLaw.hxx>
 #include <FairCurve_DistributionOfSagging.hxx>
--- a/src/FairCurve/FairCurve_DistributionOfTension.cxx
+++ b/src/FairCurve/FairCurve_DistributionOfTension.cxx
@@ -11,14 +11,6 @@
 // Alternatively, this file may be used under the terms of Open CASCADE
 // commercial license or contractual agreement.

-// 30-01-1996 : PMN Version originale
-
-#ifndef OCCT_DEBUG
-#define No_Standard_RangeError
-#define No_Standard_OutOfRange
-#endif
-
-
 #include <BSplCLib.hxx>
 #include <FairCurve_BattenLaw.hxx>
 #include <FairCurve_DistributionOfTension.hxx>
--- a/src/FairCurve/FairCurve_Energy.cxx
+++ b/src/FairCurve/FairCurve_Energy.cxx
@@ -14,12 +14,6 @@
 // Alternatively, this file may be used under the terms of Open CASCADE
 // commercial license or contractual agreement.

-#ifndef OCCT_DEBUG
-#define No_Standard_RangeError
-#define No_Standard_OutOfRange
-#endif
-
-
 #include <FairCurve_Energy.hxx>
 #include <gp_Pnt2d.hxx>
 #include <gp_Vec2d.hxx>
--- a/src/FairCurve/FairCurve_EnergyOfBatten.cxx
+++ b/src/FairCurve/FairCurve_EnergyOfBatten.cxx
@@ -14,12 +14,6 @@
 // Alternatively, this file may be used under the terms of Open CASCADE
 // commercial license or contractual agreement.

-#ifndef OCCT_DEBUG
-#define No_Standard_RangeError
-#define No_Standard_OutOfRange
-#endif
-
-
 #include <FairCurve_BattenLaw.hxx>
 #include <FairCurve_EnergyOfBatten.hxx>
 #include <math_GaussSetIntegration.hxx>
--- a/src/FairCurve/FairCurve_MinimalVariation.cxx
+++ b/src/FairCurve/FairCurve_MinimalVariation.cxx
@@ -14,12 +14,6 @@
 // Alternatively, this file may be used under the terms of Open CASCADE
 // commercial license or contractual agreement.

-#ifndef OCCT_DEBUG
-#define No_Standard_RangeError
-#define No_Standard_OutOfRange
-#endif
-
-
 #include <BSplCLib.hxx>
 #include <FairCurve_BattenLaw.hxx>
 #include <FairCurve_EnergyOfMVC.hxx>
--- a/src/Geom/Geom_BSplineCurve.cxx
+++ b/src/Geom/Geom_BSplineCurve.cxx
@@ -14,22 +14,6 @@
 // Alternatively, this file may be used under the terms of Open CASCADE
 // commercial license or contractual agreement.

-//Avril 1991 : constructeurs + methodes de lecture.
-//Mai 1991   : revue des specifs + debut de realisation des classes tool =>
-//             implementation des methodes Set et calcul du point courant.
-//Juillet 1991 : voir egalement File Geom_BSplineCurve_1.cxx
-//Juin    1992 : mise a plat des valeurs nodales - amelioration des
-//               performances sur calcul du point courant
-
-//RLE Aug 1993  Remove Swaps, Remove typedefs, Update BSplCLib
-//              debug periodic, IncreaseDegree
-// 21-Mar-95 : xab implemented cache
-// 14-Mar-96 : xab implemented MovePointAndTangent 
-// 13-Oct-96 : pmn Bug dans SetPeriodic (PRO6088) et Segment (PRO6250)
-
-#define No_Standard_OutOfRange
-
-
 #include <BSplCLib.hxx>
 #include <BSplCLib_KnotDistribution.hxx>
 #include <BSplCLib_MultDistribution.hxx>
--- a/src/Geom/Geom_BSplineSurface.cxx
+++ b/src/Geom/Geom_BSplineSurface.cxx
@@ -14,15 +14,6 @@
 // Alternatively, this file may be used under the terms of Open CASCADE
 // commercial license or contractual agreement.

-// 14-Mar-96 : xab  portage hp
-// pmn : 28-Jun-96 Distinction entre la continuite en U et V (bug PRO4625)
-// pmn : 07-Jan-97 Centralisation des verif rational (PRO6834)
-//       et ajout des InvalideCache() dans les SetWeight*(PRO6833)
-// RBD : 15-10-98 ; Le cache est maintenant calcule sur [-1,1] (pro15537).
-// jct : 19-01-99 ; permutation de urational et vrational dans Rational.
-#define No_Standard_OutOfRange
-
-
 #include <BSplCLib.hxx>
 #include <BSplSLib.hxx>
 #include <Geom_BSplineSurface.hxx>
--- a/src/Geom/Geom_BezierCurve.cxx
+++ b/src/Geom/Geom_BezierCurve.cxx
@@ -14,19 +14,6 @@
 // Alternatively, this file may be used under the terms of Open CASCADE
 // commercial license or contractual agreement.

-// Passage en classe persistante - 23/01/91
-// Modif suite a la deuxieme revue de projet toolkit Geometry -23/01/91
-// Infos :
-// Actuellement pour les champs de la courbe le tableau des poles est 
-// declare de 1 a NbPoles et le tableau des poids est declare de 1 a NbPoles
-
-// Revised RLE  Aug 19 1993
-// Suppressed Swaps, added Init, removed typedefs
-
-#define No_Standard_OutOfRange
-#define No_Standard_DimensionError
-
-
 #include <Geom_BezierCurve.hxx>
 #include <Geom_Geometry.hxx>
 #include <gp.hxx>
--- a/src/Geom/Geom_BezierSurface.cxx
+++ b/src/Geom/Geom_BezierSurface.cxx
@@ -14,19 +14,6 @@
 // Alternatively, this file may be used under the terms of Open CASCADE
 // commercial license or contractual agreement.

-//Passage en classe persistante - 23/01/91
-//Modif suite a la deuxieme revue de projet toolkit Geometry -23/01/91
-// pmn : 21/10/95 ; Correction de la methode segment (PRO5853)
-// pmn : 31-Dec-96; Bonne gestion des poids (bug PRO4622)
-// xab : 07-Jul-97; le cache est instable en degree 21
-//       a partir du degree 15 on ne l'utilise plus
-// RBD : 15/10/98 ; Le cache est desormais defini sur [-1,1] (pro15537).
-// pmn : 10/12/98 ; Update de la methode segment (suite a la modif de cache).
-
-#define No_Standard_OutOfRange
-#define No_Standard_DimensionError
-
-
 #include <BSplCLib.hxx>
 #include <Geom_BezierCurve.hxx>
 #include <Geom_BezierSurface.hxx>
--- a/src/Geom2d/Geom2d_BSplineCurve.cxx
+++ b/src/Geom2d/Geom2d_BSplineCurve.cxx
@@ -14,21 +14,6 @@
 // Alternatively, this file may be used under the terms of Open CASCADE
 // commercial license or contractual agreement.

-//Avril 1991 : constructeurs + methodes de lecture.
-//Mai 1991   : revue des specifs + debut de realisation des classes tool =>
-//             implementation des methodes Set et calcul du point courant.
-//Juillet 1991 : voir egalement File Geom2d_BSplineCurve_1.cxx
-//Juin    1992 : mise a plat des valeurs nodales - amelioration des
-//               performances sur calcul du point courant
-
-//RLE Aug 1993  Remove Swaps, Init methods, Remove typedefs
-//  14-Mar-96 : xab implemented MovePointAndTangent
-
-//SAMTECH Jan 2002 : add text to Raise()
-
-#define No_Standard_OutOfRange
-
-
 #include <BSplCLib.hxx>
 #include <BSplCLib_KnotDistribution.hxx>
 #include <BSplCLib_MultDistribution.hxx>
--- a/src/Geom2d/Geom2d_BezierCurve.cxx
+++ b/src/Geom2d/Geom2d_BezierCurve.cxx
@@ -14,20 +14,6 @@
 // Alternatively, this file may be used under the terms of Open CASCADE
 // commercial license or contractual agreement.

-// Passage en classe persistante - 23/01/91
-// Modif suite a la deuxieme revue de projet toolkit Geometry -23/01/91
-// Infos :
-// Actuellement pour les champs de la courbe le tableau des poles est 
-// declare de 1 a NbPoles et le tableau des poids est declare de 1 a NbPoles
-
-
-// Revised RLE  Aug 19 1993
-// Suppressed Swaps, added Init, removed typedefs
-
-#define No_Standard_OutOfRange
-#define No_Standard_DimensionError
-
-
 #include <Geom2d_BezierCurve.hxx>
 #include <Geom2d_Geometry.hxx>
 #include <gp.hxx>
--- a/src/Geom2dAdaptor/Geom2dAdaptor_Curve.cxx
+++ b/src/Geom2dAdaptor/Geom2dAdaptor_Curve.cxx
@@ -14,14 +14,6 @@
 // Alternatively, this file may be used under the terms of Open CASCADE
 // commercial license or contractual agreement.

-// 20/02/97 : PMN -> Positionement local sur BSpline (PRO6902)
-// 10/07/97 : PMN -> Pas de calcul de resolution dans Nb(Intervals) (PRO9248)
-// 20/10/97 : JPI -> traitement des offset curves
-
-#define No_Standard_RangeError
-#define No_Standard_OutOfRange
-
-
 #include <Adaptor2d_HCurve2d.hxx>
 #include <BSplCLib.hxx>
 #include <BSplCLib_Cache.hxx>
--- a/src/GeomAdaptor/GeomAdaptor_Curve.cxx
+++ b/src/GeomAdaptor/GeomAdaptor_Curve.cxx
@@ -14,14 +14,6 @@
 // Alternatively, this file may be used under the terms of Open CASCADE
 // commercial license or contractual agreement.

-// 20/02/97 : PMN -> Positionement local sur BSpline (PRO6902)
-// 10/07/97 : PMN -> Pas de calcul de resolution dans Nb(Intervals)(PRO9248)
-// 20/10/97 : RBV -> traitement des offset curves
-
-#define No_Standard_RangeError
-#define No_Standard_OutOfRange
-
-
 #include <Adaptor3d_HCurve.hxx>
 #include <BSplCLib.hxx>
 #include <BSplCLib_Cache.hxx>
--- a/src/GeomAdaptor/GeomAdaptor_Surface.cxx
+++ b/src/GeomAdaptor/GeomAdaptor_Surface.cxx
@@ -14,13 +14,6 @@
 // Alternatively, this file may be used under the terms of Open CASCADE
 // commercial license or contractual agreement.

-// Modified:	Thu Nov 26 16:37:18 1998
-//		correction in NbUIntervals for SurfaceOfLinearExtrusion 
-//		(PRO16346)
-
-#define No_Standard_RangeError
-#define No_Standard_OutOfRange
-
 #include <Adaptor3d_HCurve.hxx>
 #include <Adaptor3d_HSurface.hxx>
 #include <BSplCLib.hxx>
--- a/src/GeomFill/GeomFill_SweepFunction.cxx
+++ b/src/GeomFill/GeomFill_SweepFunction.cxx
@@ -14,13 +14,6 @@
 // Alternatively, this file may be used under the terms of Open CASCADE
 // commercial license or contractual agreement.

-#ifndef OCCT_DEBUG
-#define No_Standard_RangeError
-#define No_Standard_OutOfRange
-#define No_Standard_DimensionError
-#endif
-
-
 #include <GeomFill_LocationLaw.hxx>
 #include <GeomFill_SectionLaw.hxx>
 #include <GeomFill_SweepFunction.hxx>
--- a/src/HLRAlgo/HLRAlgo_BiPoint.cxx
+++ b/src/HLRAlgo/HLRAlgo_BiPoint.cxx
@@ -14,11 +14,6 @@
 // Alternatively, this file may be used under the terms of Open CASCADE
 // commercial license or contractual agreement.

-#ifndef No_Exception
-#define No_Exception
-#endif
-
-
 #include <HLRAlgo_BiPoint.hxx>

 //=======================================================================
--- a/src/HLRAlgo/HLRAlgo_EdgeIterator.cxx
+++ b/src/HLRAlgo/HLRAlgo_EdgeIterator.cxx
@@ -14,11 +14,6 @@
 // Alternatively, this file may be used under the terms of Open CASCADE
 // commercial license or contractual agreement.

-#ifndef No_Exception
-#define No_Exception
-#endif
-
-
 #include <HLRAlgo_EdgeIterator.hxx>
 #include <HLRAlgo_EdgeStatus.hxx>

--- a/src/HLRAlgo/HLRAlgo_EdgeStatus.cxx
+++ b/src/HLRAlgo/HLRAlgo_EdgeStatus.cxx
@@ -14,11 +14,6 @@
 // Alternatively, this file may be used under the terms of Open CASCADE
 // commercial license or contractual agreement.

-#ifndef No_Exception
-#define No_Exception
-#endif
-
-
 #include <HLRAlgo_EdgeStatus.hxx>
 #include <Standard_OutOfRange.hxx>

--- a/src/HLRAlgo/HLRAlgo_EdgesBlock.cxx
+++ b/src/HLRAlgo/HLRAlgo_EdgesBlock.cxx
@@ -14,11 +14,6 @@
 // Alternatively, this file may be used under the terms of Open CASCADE
 // commercial license or contractual agreement.

-#ifndef No_Exception
-#define No_Exception
-#endif
-
-
 #include <HLRAlgo_EdgesBlock.hxx>
 #include <Standard_Type.hxx>

--- a/src/HLRAlgo/HLRAlgo_PolyAlgo.cxx
+++ b/src/HLRAlgo/HLRAlgo_PolyAlgo.cxx
@@ -14,11 +14,6 @@
 // Alternatively, this file may be used under the terms of Open CASCADE
 // commercial license or contractual agreement.

-#ifndef No_Exception
-//#define No_Exception
-#endif
-
-
 #include <HLRAlgo_BiPoint.hxx>
 #include <HLRAlgo_EdgeStatus.hxx>
 #include <HLRAlgo_ListOfBPoint.hxx>
--- a/src/HLRAlgo/HLRAlgo_PolyShellData.cxx
+++ b/src/HLRAlgo/HLRAlgo_PolyShellData.cxx
@@ -14,11 +14,6 @@
 // Alternatively, this file may be used under the terms of Open CASCADE
 // commercial license or contractual agreement.

-#ifndef No_Exception
-//#define No_Exception
-#endif
-
-
 #include <HLRAlgo_BiPoint.hxx>
 #include <HLRAlgo_ListIteratorOfListOfBPoint.hxx>
 #include <HLRAlgo_PolyData.hxx>
--- a/src/HLRAlgo/HLRAlgo_Projector.cxx
+++ b/src/HLRAlgo/HLRAlgo_Projector.cxx
@@ -14,11 +14,6 @@
 // Alternatively, this file may be used under the terms of Open CASCADE
 // commercial license or contractual agreement.

-#ifndef No_Exception
-// #define No_Exception
-#endif
-
-
 #include <gp_Ax2.hxx>
 #include <gp_Ax3.hxx>
 #include <gp_Lin.hxx>
--- a/src/HLRAlgo/HLRAlgo_WiresBlock.cxx
+++ b/src/HLRAlgo/HLRAlgo_WiresBlock.cxx
@@ -14,10 +14,6 @@
 // Alternatively, this file may be used under the terms of Open CASCADE
 // commercial license or contractual agreement.

-#ifndef No_Exception
-#define No_Exception
-#endif
-
 #include <HLRAlgo_WiresBlock.hxx>
 #include <Standard_Type.hxx>

--- a/src/HLRBRep/HLRBRep_Algo.cxx
+++ b/src/HLRBRep/HLRBRep_Algo.cxx
@@ -14,9 +14,6 @@
 // Alternatively, this file may be used under the terms of Open CASCADE
 // commercial license or contractual agreement.

-#define No_Standard_OutOfRange
-
-
 #include <HLRBRep_Algo.hxx>
 #include <HLRBRep_ShapeBounds.hxx>
 #include <HLRTopoBRep_OutLiner.hxx>
--- a/src/HLRBRep/HLRBRep_Data.cxx
+++ b/src/HLRBRep/HLRBRep_Data.cxx
@@ -14,8 +14,6 @@
 // Alternatively, this file may be used under the terms of Open CASCADE
 // commercial license or contractual agreement.

-//#define No_Standard_OutOfRange
-
 #include <BRepTopAdaptor_Tool.hxx>
 #include <BRepTopAdaptor_TopolTool.hxx>
 #include <ElCLib.hxx>
--- a/src/HLRBRep/HLRBRep_EdgeBuilder.cxx
+++ b/src/HLRBRep/HLRBRep_EdgeBuilder.cxx
@@ -14,11 +14,6 @@
 // Alternatively, this file may be used under the terms of Open CASCADE
 // commercial license or contractual agreement.

-#ifndef No_Exception
-#define No_Exception
-#endif
-
-
 #include <HLRAlgo_Intersection.hxx>
 #include <HLRBRep_AreaLimit.hxx>
 #include <HLRBRep_EdgeBuilder.hxx>
--- a/src/HLRBRep/HLRBRep_EdgeIList.cxx
+++ b/src/HLRBRep/HLRBRep_EdgeIList.cxx
@@ -14,11 +14,6 @@
 // Alternatively, this file may be used under the terms of Open CASCADE
 // commercial license or contractual agreement.

-#ifndef No_Exception
-#define No_Exception
-#endif
-
-
 #include <HLRAlgo_Interference.hxx>
 #include <HLRAlgo_ListIteratorOfInterferenceList.hxx>
 #include <HLRBRep_EdgeIList.hxx>
--- a/src/HLRBRep/HLRBRep_EdgeInterferenceTool.cxx
+++ b/src/HLRBRep/HLRBRep_EdgeInterferenceTool.cxx
@@ -14,11 +14,6 @@
 // Alternatively, this file may be used under the terms of Open CASCADE
 // commercial license or contractual agreement.

-#ifndef No_Exception
-#define No_Exception
-#endif
-
-
 #include <gp_Dir.hxx>
 #include <HLRAlgo_Interference.hxx>
 #include <HLRAlgo_Intersection.hxx>
--- a/src/HLRBRep/HLRBRep_FaceIterator.cxx
+++ b/src/HLRBRep/HLRBRep_FaceIterator.cxx
@@ -14,11 +14,6 @@
 // Alternatively, this file may be used under the terms of Open CASCADE
 // commercial license or contractual agreement.

-#ifndef No_Exception
-#define No_Exception
-#endif
-
-
 #include <HLRAlgo_EdgesBlock.hxx>
 #include <HLRAlgo_WiresBlock.hxx>
 #include <HLRBRep_FaceData.hxx>
--- a/src/HLRBRep/HLRBRep_Hider.cxx
+++ b/src/HLRBRep/HLRBRep_Hider.cxx
@@ -14,9 +14,6 @@
 // Alternatively, this file may be used under the terms of Open CASCADE
 // commercial license or contractual agreement.

-#define No_Standard_OutOfRange
-
-
 #include <HLRAlgo_Coincidence.hxx>
 #include <HLRAlgo_Interference.hxx>
 #include <HLRAlgo_InterferenceList.hxx>
--- a/src/HLRBRep/HLRBRep_Intersector.cxx
+++ b/src/HLRBRep/HLRBRep_Intersector.cxx
@@ -14,11 +14,6 @@
 // Alternatively, this file may be used under the terms of Open CASCADE
 // commercial license or contractual agreement.

-#ifndef No_Exception
-#define No_Exception
-#endif
-
-
 #include <Bnd_Box.hxx>
 #include <ElCLib.hxx>
 #include <gp.hxx>
--- a/src/HLRBRep/HLRBRep_ShapeToHLR.cxx
+++ b/src/HLRBRep/HLRBRep_ShapeToHLR.cxx
@@ -14,11 +14,6 @@
 // Alternatively, this file may be used under the terms of Open CASCADE
 // commercial license or contractual agreement.

-#ifndef No_Exception
-// #define No_Exception
-#endif
-
-
 #include <BRep_Tool.hxx>
 #include <BRepTools.hxx>
 #include <BRepTopAdaptor_MapOfShapeTool.hxx>
--- a/src/HLRBRep/HLRBRep_VertexList.cxx
+++ b/src/HLRBRep/HLRBRep_VertexList.cxx
@@ -14,11 +14,6 @@
 // Alternatively, this file may be used under the terms of Open CASCADE
 // commercial license or contractual agreement.

-#ifndef No_Exception
-#define No_Exception
-#endif
-
-
 #include <HLRAlgo_Intersection.hxx>
 #include <HLRBRep_EdgeInterferenceTool.hxx>
 #include <HLRBRep_VertexList.hxx>
--- a/src/IntAna/IntAna_Curve.cxx
+++ b/src/IntAna/IntAna_Curve.cxx
@@ -14,11 +14,6 @@
 // Alternatively, this file may be used under the terms of Open CASCADE
 // commercial license or contractual agreement.

-#ifndef OCCT_DEBUG
-#define No_Standard_RangeError
-#define No_Standard_OutOfRange
-#endif
-
 //----------------------------------------------------------------------
 //-- Differents constructeurs sont proposes qui correspondent aux
 //-- polynomes en Z :  
--- a/src/IntAna/IntAna_Int3Pln.cxx
+++ b/src/IntAna/IntAna_Int3Pln.cxx
@@ -12,12 +12,6 @@
 // Alternatively, this file may be used under the terms of Open CASCADE
 // commercial license or contractual agreement.

-#ifndef OCCT_DEBUG
-#define No_Standard_RangeError
-#define No_Standard_OutOfRange
-#endif
-
-
 #include <gp.hxx>
 #include <gp_Pln.hxx>
 #include <gp_Pnt.hxx>
--- a/src/IntAna/IntAna_IntConicQuad.cxx
+++ b/src/IntAna/IntAna_IntConicQuad.cxx
@@ -14,11 +14,6 @@
 // Alternatively, this file may be used under the terms of Open CASCADE
 // commercial license or contractual agreement.

-#ifndef OCCT_DEBUG
-#define No_Standard_RangeError
-#define No_Standard_OutOfRange
-#endif
-
 #define CREATE  IntAna_IntConicQuad::IntAna_IntConicQuad
 #define PERFORM void IntAna_IntConicQuad::Perform

--- a/src/IntAna/IntAna_IntQuadQuad.cxx
+++ b/src/IntAna/IntAna_IntQuadQuad.cxx
@@ -18,11 +18,6 @@

 #include <Standard_Stream.hxx>

-#ifndef OCCT_DEBUG
-#define No_Standard_RangeError
-#define No_Standard_OutOfRange
-#endif
-
 //======================================================================
 //== I n t e r s e c t i o n   C O N E           Q U A D R I Q U E   
 //==                           C Y L I N D R E   Q U A D R I Q U E
--- a/src/IntAna/IntAna_QuadQuadGeo.cxx
+++ b/src/IntAna/IntAna_QuadQuadGeo.cxx
@@ -19,11 +19,6 @@
 //--          If the intersection is not a conic, 
 //--          analytical methods must be called.
 //----------------------------------------------------------------------
-#ifndef OCCT_DEBUG
-#define No_Standard_RangeError
-#define No_Standard_OutOfRange
-#endif
-

 #include <ElCLib.hxx>
 #include <ElSLib.hxx>
--- a/src/IntAna/IntAna_Quadric.cxx
+++ b/src/IntAna/IntAna_Quadric.cxx
@@ -14,12 +14,6 @@
 // Alternatively, this file may be used under the terms of Open CASCADE
 // commercial license or contractual agreement.

-#ifndef OCCT_DEBUG
-#define No_Standard_RangeError
-#define No_Standard_OutOfRange
-#endif
-
-
 #include <gp_Ax3.hxx>
 #include <gp_Cone.hxx>
 #include <gp_Cylinder.hxx>
--- a/src/IntCurve/IntCurve_DistBetweenPCurvesGen.gxx
+++ b/src/IntCurve/IntCurve_DistBetweenPCurvesGen.gxx
@@ -14,13 +14,6 @@
 // Alternatively, this file may be used under the terms of Open CASCADE
 // commercial license or contractual agreement.

-#ifndef OCCT_DEBUG
-#define No_Standard_RangeError
-#define No_Standard_OutOfRange
-#endif
-
-
-
 #include <math_Vector.hxx>
 #include <math_Matrix.hxx>

--- a/src/IntCurve/IntCurve_IntPolyPolyGen.gxx
+++ b/src/IntCurve/IntCurve_IntPolyPolyGen.gxx
@@ -14,15 +14,6 @@
 // Alternatively, this file may be used under the terms of Open CASCADE
 // commercial license or contractual agreement.

-//  Modified by skv - Tue Mar  1 14:22:09 2005 OCC8169
-
-
-#ifndef OCCT_DEBUG
-#define No_Standard_RangeError
-#define No_Standard_OutOfRange
-#endif
-
-
 #include <Standard_ConstructionError.hxx>

 #include <IntRes2d_Domain.hxx>
--- a/src/IntCurveSurface/IntCurveSurface_Inter.gxx
+++ b/src/IntCurveSurface/IntCurveSurface_Inter.gxx
@@ -14,12 +14,6 @@
 // Alternatively, this file may be used under the terms of Open CASCADE
 // commercial license or contractual agreement.

-//#ifndef OCCT_DEBUG
-//#define No_Standard_RangeError
-//#define No_Standard_OutOfRange
-//#endif
-
-
 #define  TOLTANGENCY         0.00000001
 #define  TOLERANCE_ANGULAIRE 1.e-12//0.00000001
 #define  TOLERANCE           0.00000001
--- a/src/IntImp/IntImp_Int2S.gxx
+++ b/src/IntImp/IntImp_Int2S.gxx
@@ -12,12 +12,6 @@
 // Alternatively, this file may be used under the terms of Open CASCADE
 // commercial license or contractual agreement.

-#ifndef OCCT_DEBUG
-#define No_Standard_RangeError
-#define No_Standard_OutOfRange
-#endif
-
-
 #include <IntImp_ComputeTangence.hxx>
 #include <math_FunctionSetRoot.hxx>
 #include <math_Vector.hxx>
--- a/src/IntImp/IntImp_IntCS.gxx
+++ b/src/IntImp/IntImp_IntCS.gxx
@@ -12,12 +12,6 @@
 // Alternatively, this file may be used under the terms of Open CASCADE
 // commercial license or contractual agreement.

-#ifndef OCCT_DEBUG
-#define No_Standard_RangeError
-#define No_Standard_OutOfRange
-#endif
-
-
 #include <StdFail_NotDone.hxx>
 #include <Standard_DomainError.hxx>
 #include <IntImp_ComputeTangence.hxx>
--- a/src/IntImp/IntImp_ZerCSParFunc.gxx
+++ b/src/IntImp/IntImp_ZerCSParFunc.gxx
@@ -15,12 +15,6 @@
 #include <gp_Pnt.hxx>
 #include <gp_Vec.hxx>

-#ifndef OCCT_DEBUG
-#define No_Standard_RangeError
-#define No_Standard_OutOfRange
-#endif
-
-
 IntImp_ZerCSParFunc::IntImp_ZerCSParFunc(const ThePSurface& S,
 					 const TheCurve& C) {
  surface = S;
--- a/src/IntImp/IntImp_ZerImpFunc.gxx
+++ b/src/IntImp/IntImp_ZerImpFunc.gxx
@@ -16,11 +16,6 @@
 #define EpsAng2 1.e-16
 #define Tolpetit 1.e-16

-#ifndef OCCT_DEBUG
-#define No_Standard_RangeError
-#define No_Standard_OutOfRange
-#endif
-
 #define SURF     (*((ThePSurface *)(surf)))
 #define FUNC     (*((TheISurface *)(func)))

--- a/src/IntImp/IntImp_ZerParFunc.gxx
+++ b/src/IntImp/IntImp_ZerParFunc.gxx
@@ -12,12 +12,6 @@
 // Alternatively, this file may be used under the terms of Open CASCADE
 // commercial license or contractual agreement.

-#ifndef OCCT_DEBUG
-#define No_Standard_RangeError
-#define No_Standard_OutOfRange
-#endif
-
-
 #include <IntImp_ComputeTangence.hxx>
 #include <Standard_ConstructionError.hxx>
 #include <Precision.hxx>
--- a/src/IntPatch/IntPatch_CSFunction.cxx
+++ b/src/IntPatch/IntPatch_CSFunction.cxx
@@ -12,7 +12,6 @@
 // Alternatively, this file may be used under the terms of Open CASCADE
 // commercial license or contractual agreement.

-
 #include <Adaptor2d_HCurve2d.hxx>
 #include <Adaptor3d_HSurface.hxx>
 #include <Adaptor3d_HSurfaceTool.hxx>
@@ -24,12 +23,6 @@
 #include <IntPatch_HCurve2dTool.hxx>
 #include <math_Matrix.hxx>

-#ifndef OCCT_DEBUG
-#define No_Standard_RangeError
-#define No_Standard_OutOfRange
-#endif
-
-
 #define SURFACE1 (*((Handle(Adaptor3d_HSurface) *)(surface1)))
 #define SURFACE2 (*((Handle(Adaptor3d_HSurface) *)(surface2)))
 #define CURVE    (*((Handle(Adaptor2d_HCurve2d) *)(curve)))
--- a/src/IntPatch/IntPatch_ImpPrmIntersection.cxx
+++ b/src/IntPatch/IntPatch_ImpPrmIntersection.cxx
@@ -38,11 +38,6 @@
 #include <math_Matrix.hxx>
 #include <math_Vector.hxx>

-#ifndef OCCT_DEBUG
-#define No_Standard_RangeError
-#define No_Standard_OutOfRange
-#endif
-
 static Standard_Boolean DecomposeResult(const Handle(IntPatch_PointLine)& theLine,
                                        const Standard_Boolean       IsReversed,
                                        const IntSurf_Quadric&       theQuad,
--- a/src/IntStart/IntStart_SearchInside.gxx
+++ b/src/IntStart/IntStart_SearchInside.gxx
@@ -12,13 +12,6 @@
 // Alternatively, this file may be used under the terms of Open CASCADE
 // commercial license or contractual agreement.

-#ifndef OCCT_DEBUG
-#define No_Standard_RangeError
-#define No_Standard_OutOfRange
-#endif
-
-
-
 #include <math_FunctionSetRoot.hxx>
 #include <Precision.hxx>
 #include <gp_Pnt2d.hxx>
--- a/src/IntWalk/IntWalk_IWalking_2.gxx
+++ b/src/IntWalk/IntWalk_IWalking_2.gxx
@@ -17,12 +17,6 @@
 #include <Bnd_Range.hxx>
 #include <TColStd_MapOfInteger.hxx>

-#ifndef OCCT_DEBUG
-#define No_Standard_RangeError
-#define No_Standard_OutOfRange
-#endif
-
-
 // _______________________________________________
 //
 // Location of point (u, v) in the natural domain of a surface AND update  
--- a/src/IntWalk/IntWalk_IWalking_6.gxx
+++ b/src/IntWalk/IntWalk_IWalking_6.gxx
@@ -12,12 +12,6 @@
 // Alternatively, this file may be used under the terms of Open CASCADE
 // commercial license or contractual agreement.

-#ifndef OCCT_DEBUG
-#define No_Standard_RangeError
-#define No_Standard_OutOfRange
-#endif
-
-
 void IntWalk_IWalking::AddPointInCurrentLine
         (const Standard_Integer N,
 	  const ThePointOfPath& PathPnt,
--- a/src/Intrv/Intrv_Intervals.cxx
+++ b/src/Intrv/Intrv_Intervals.cxx
@@ -14,11 +14,6 @@
 // Alternatively, this file may be used under the terms of Open CASCADE
 // commercial license or contractual agreement.

-#ifndef No_Exception
-#define No_Exception
-#endif
-
-
 #include <Intrv_Interval.hxx>
 #include <Intrv_Intervals.hxx>
 #include <Standard_OutOfRange.hxx>
--- a/src/OSD/OSD_signal.cxx
+++ b/src/OSD/OSD_signal.cxx
@@ -93,10 +93,14 @@ static LONG _osd_debug   ( void );
 //# define _OSD_FPX ( _EM_INVALID | _EM_DENORMAL | _EM_ZERODIVIDE | _EM_OVERFLOW | _EM_UNDERFLOW )
 # define _OSD_FPX ( _EM_INVALID | _EM_DENORMAL | _EM_ZERODIVIDE | _EM_OVERFLOW )

-#ifdef OCC_CONVERT_SIGNALS
-#define THROW_OR_JUMP(Type,Message) Type::NewInstance(Message)->Jump()
+#ifdef OCCT_DEBUG_SANITIZE_EXCEPTIONS
+  #define THROW_OR_JUMP(Type,Message) throw std::runtime_error (Message)
 #else
-#define THROW_OR_JUMP(Type,Message) throw Type(Message)
+#ifdef OCC_CONVERT_SIGNALS
+  #define THROW_OR_JUMP(Type,Message) Type::NewInstance(Message)->Jump()
+#else
+  #define THROW_OR_JUMP(Type,Message) throw Type(Message)
+#endif
 #endif

 //=======================================================================
--- a/src/Standard/Standard_Handle.hxx
+++ b/src/Standard/Standard_Handle.hxx
@@ -20,6 +20,10 @@

 #include <type_traits>

+#ifdef OCCT_DEBUG_SANITIZE_EXCEPTIONS
+  #include <stdexcept>
+#endif
+
 class Standard_Transient;

 //! Namespace opencascade is intended for low-level template classes and functions
@@ -181,10 +185,28 @@ namespace opencascade {
    T* get() const { return static_cast<T*>(this->entity); }

    //! Member access operator (note non-const)
-    T* operator-> () const { return static_cast<T*>(this->entity); }
+    T* operator-> () const
+    {
+    #ifdef OCCT_DEBUG_SANITIZE_EXCEPTIONS
+      if (entity == 0)
+      {
+        throw std::runtime_error ("null pointer exception");
+      }
+    #endif
+      return static_cast<T*>(this->entity);
+    }

    //! Dereferencing operator (note non-const)
-    T& operator* () const { return *get(); }
+    T& operator* () const
+    {
+    #ifdef OCCT_DEBUG_SANITIZE_EXCEPTIONS
+      if (entity == 0)
+      {
+        throw std::runtime_error ("null pointer exception");
+      }
+    #endif
+      return *get();
+    }

    //! Check for equality
    template <class T2>
--- a/src/Standard/Standard_OutOfRange.hxx
+++ b/src/Standard/Standard_OutOfRange.hxx
@@ -25,7 +25,10 @@
 class Standard_OutOfRange;
 DEFINE_STANDARD_HANDLE(Standard_OutOfRange, Standard_RangeError)

-#if !defined No_Exception && !defined No_Standard_OutOfRange
+#ifdef OCCT_DEBUG_SANITIZE_EXCEPTIONS
+#define Standard_OutOfRange_Raise_if(CONDITION, MESSAGE) \
+  if (CONDITION) throw std::runtime_error (MESSAGE);
+#elif !defined No_Exception && !defined No_Standard_OutOfRange
 #if defined(__GNUC__) && (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 2))
  // suppress false-positive warnings produced by GCC optimizer
  #define Standard_OutOfRange_Raise_if(CONDITION, MESSAGE) \
--- a/src/StdSelect/StdSelect_BRepSelectionTool.cxx
+++ b/src/StdSelect/StdSelect_BRepSelectionTool.cxx
@@ -741,6 +741,10 @@ Standard_Boolean StdSelect_BRepSelectionTool::GetSensitiveForFace (const TopoDS_
      }
    }
  }
+  if (aWirePoints.IsEmpty())
+  {
+    return Standard_False;
+  }

  Handle(TColgp_HArray1OfPnt) aFacePoints = new TColgp_HArray1OfPnt (1, aWirePoints.Length());
  {
--- a/src/TopExp/TopExp.cxx
+++ b/src/TopExp/TopExp.cxx
@@ -14,11 +14,6 @@
 // Alternatively, this file may be used under the terms of Open CASCADE
 // commercial license or contractual agreement.

-#define No_Standard_NoMoreObject
-#define No_Standard_NoSuchObject
-#define No_Standard_TypeMismatch
-
-
 #include <TopExp.hxx>
 #include <TopExp_Explorer.hxx>
 #include <TopoDS.hxx>
--- a/src/TopExp/TopExp_Explorer.cxx
+++ b/src/TopExp/TopExp_Explorer.cxx
@@ -14,10 +14,6 @@
 // Alternatively, this file may be used under the terms of Open CASCADE
 // commercial license or contractual agreement.

-#define No_Standard_NoMoreObject
-#define No_Standard_NoSuchObject
-
-
 #include <Standard.hxx>
 #include <Standard_NoMoreObject.hxx>
 #include <Standard_NoSuchObject.hxx>
--- a/src/TopLoc/TopLoc_Location.cxx
+++ b/src/TopLoc/TopLoc_Location.cxx
@@ -14,9 +14,6 @@
 // Alternatively, this file may be used under the terms of Open CASCADE
 // commercial license or contractual agreement.

-#define No_Standard_NoSuchObject
-
-
 #include <gp_Trsf.hxx>
 #include <Standard_ConstructionError.hxx>
 #include <Standard_NoSuchObject.hxx>
--- a/src/TopOpeBRepDS/TopOpeBRepDS_Explorer.cxx
+++ b/src/TopOpeBRepDS/TopOpeBRepDS_Explorer.cxx
@@ -14,10 +14,6 @@
 // Alternatively, this file may be used under the terms of Open CASCADE
 // commercial license or contractual agreement.

-#define No_Standard_NoMoreObject
-#define No_Standard_NoSuchObject
-
-
 #include <Standard_NoMoreObject.hxx>
 #include <Standard_NoSuchObject.hxx>
 #include <TopoDS.hxx>
--- a/src/TopoDS/TopoDS_Iterator.cxx
+++ b/src/TopoDS/TopoDS_Iterator.cxx
@@ -14,9 +14,6 @@
 // Alternatively, this file may be used under the terms of Open CASCADE
 // commercial license or contractual agreement.

-#define No_Standard_NoSuchObject
-
-
 #include <Standard_NoMoreObject.hxx>
 #include <Standard_NoSuchObject.hxx>
 #include <TopoDS_Iterator.hxx>
--- a/src/gp/gp_Ax1.cxx
+++ b/src/gp/gp_Ax1.cxx
@@ -12,14 +12,6 @@
 // Alternatively, this file may be used under the terms of Open CASCADE
 // commercial license or contractual agreement.

-// JCV 1/10/90 Changement de nom du package vgeom -> gp
-// JCV 12/12/90 modif introduction des classes XYZ et Mat dans le package
-// LPA, JCV  07/92 passage sur C1.
-// JCV 07/92 Introduction de la method Dump 
-
-#define No_Standard_OutOfRange
-
-
 #include <gp.hxx>
 #include <gp_Ax1.hxx>
 #include <gp_Ax2.hxx>
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
kgv	8737f01015	StdSelect_BRepSelectionTool::GetSensitiveForFace() - add missing check for an empty sequence	2019-03-24 10:32:05 +03:00
kgv	25fd0de70e	Remove No_Standard_* macros defined within .cxx files.	2019-03-24 10:32:05 +03:00
kgv	d470d17791	Added building option OCCT_DEBUG_SANITIZE_EXCEPTIONS for performing expensive checks When this option is ON, opencascade::handle throws std::runtime_error() on NULL pointer dereference, and Standard_OutOfRange_Raise_if throws std::runtime_error() instead of Standard_OutOfRange to detect cases when broken code remains hidden by exception handling.	2019-03-24 10:32:04 +03:00
kgv	c30cf52f77	0029181: Jenkins Certification Tool - testing with enabled exceptions (undefined No_Exception)	2019-03-24 10:32:04 +03:00
kgv	ccf5d5bc80	0030579: Draw Harness, Draw_Interpretor - catch exceptions other than Standard_Failure	2019-03-24 10:32:04 +03:00