Salome HOME
projects
/
modules
/
smesh.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Copyright update 2022
[modules/smesh.git]
/
src
/
SMESHUtils
/
SMESH_TryCatch.hxx
diff --git
a/src/SMESHUtils/SMESH_TryCatch.hxx
b/src/SMESHUtils/SMESH_TryCatch.hxx
index 05d00a1b551b76b60b431565434e55b246ada466..9f8e9c608a05a13a15363c21cdd8f0712c166c42 100644
(file)
--- a/
src/SMESHUtils/SMESH_TryCatch.hxx
+++ b/
src/SMESHUtils/SMESH_TryCatch.hxx
@@
-1,4
+1,4
@@
-// Copyright (C) 2007-20
16
CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-20
22
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
//
// Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@
-33,7
+33,6
@@
#include <Utils_SALOME_Exception.hxx>
#include <Standard_Failure.hxx>
#include <Standard_ErrorHandler.hxx>
#include <Utils_SALOME_Exception.hxx>
#include <Standard_Failure.hxx>
#include <Standard_ErrorHandler.hxx>
-#include <Basics_OCCTVersion.hxx>
#include <utilities.h>
// IMPORTANT: include this file _after_ OCC ones, else OCC_CATCH_SIGNALS can be undefined!
#include <utilities.h>
// IMPORTANT: include this file _after_ OCC ones, else OCC_CATCH_SIGNALS can be undefined!
@@
-66,11
+65,14
@@
//-------------------------------------------------------------------------------------
// A macro makes description of a caught exception and calls onExceptionFun(const char*).
//-------------------------------------------------------------------------------------
// A macro makes description of a caught exception and calls onExceptionFun(const char*).
-//
Two onExceptionFun() are defined here: SMESH::throwSalomeEx() and SMESH::doNothing
().
-// To add your own catch cl
o
se, define SMY_OWN_CATCH macro before including this file.
+//
Several onExceptionFun() are defined here: throwSalomeEx(), doNothing() and returnError
().
+// To add your own catch cl
au
se, define SMY_OWN_CATCH macro before including this file.
#define SMESH_CATCH( onExceptionFun ) \
} \
#define SMESH_CATCH( onExceptionFun ) \
} \
+ \
+ SMY_OWN_CATCH \
+ \
catch (Standard_Failure& ex) \
{ \
SMESH_Comment text("OCCT Exception: "); \
catch (Standard_Failure& ex) \
{ \
SMESH_Comment text("OCCT Exception: "); \
@@
-93,9
+95,6
@@
{ \
SMESH_CAUGHT onExceptionFun( ex.what() ); \
} \
{ \
SMESH_CAUGHT onExceptionFun( ex.what() ); \
} \
- \
- SMY_OWN_CATCH \
- \
catch (...) \
{ \
SMESH_CAUGHT onExceptionFun("Unknown Exception caught"); \
catch (...) \
{ \
SMESH_CAUGHT onExceptionFun("Unknown Exception caught"); \
@@
-108,6
+107,8
@@
namespace SMESH
{
SMESHUtils_EXPORT void throwSalomeEx(const char* txt);
SMESHUtils_EXPORT void doNothing(const char* txt);
{
SMESHUtils_EXPORT void throwSalomeEx(const char* txt);
SMESHUtils_EXPORT void doNothing(const char* txt);
+ SMESHUtils_EXPORT const char* returnError(const char* txt);
+ SMESHUtils_EXPORT void printErrorInDebugMode(const char* txt);
}
#endif
}
#endif