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
[bos #38500 #41499 #41496][EDF] Move thread header inclussion outside TBB conditional...
[modules/smesh.git]
/
src
/
SMESHUtils
/
SMESH_TryCatch.hxx
diff --git
a/src/SMESHUtils/SMESH_TryCatch.hxx
b/src/SMESHUtils/SMESH_TryCatch.hxx
index 9e5ffd755c71baa871d4418feee5f2d73d2afb8b..af7dec8280e92540ac4b11e82412ec9c96a24d82 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
24 CEA, EDF
, 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
@@
-65,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: "); \
@@
-92,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
+108,7
@@
namespace SMESH
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 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