A
lgorithmique
N
umérique
D
istribuée
Public GIT Repository
projects
/
simgrid.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of git+ssh://scm.gforge.inria.fr//gitroot/simgrid/simgrid
[simgrid.git]
/
src
/
xbt
/
exception.cpp
diff --git
a/src/xbt/exception.cpp
b/src/xbt/exception.cpp
index
230e330
..
5483ae5
100644
(file)
--- a/
src/xbt/exception.cpp
+++ b/
src/xbt/exception.cpp
@@
-27,7
+27,7
@@
XBT_LOG_NEW_DEFAULT_SUBCATEGORY(xbt_exception, xbt, "Exceptions");
namespace simgrid {
namespace xbt {
namespace simgrid {
namespace xbt {
-WithContextException::~WithContextException()
{}
+WithContextException::~WithContextException()
= default;
void logException(
e_xbt_log_priority_t prio,
void logException(
e_xbt_log_priority_t prio,
@@
-90,7
+90,7
@@
static void handler()
// an uncaught exception
static std::atomic_flag lock = ATOMIC_FLAG_INIT;
if (lock.test_and_set()) {
// an uncaught exception
static std::atomic_flag lock = ATOMIC_FLAG_INIT;
if (lock.test_and_set()) {
- XBT_ERROR("
Multiple uncaught exceptions
");
+ XBT_ERROR("
Handling an exception raised an exception. Bailing out.
");
std::abort();
}
std::abort();
}
@@
-132,8
+132,3
@@
void installExceptionHandler()
}
}
}
}
-
-void xbt_set_terminate()
-{
- simgrid::xbt::installExceptionHandler();
-}