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
smpirun: really disable privatization with -no-privatize.
[simgrid.git]
/
src
/
xbt
/
exception.cpp
diff --git
a/src/xbt/exception.cpp
b/src/xbt/exception.cpp
index
a1c6d0b
..
0b6b899
100644
(file)
--- a/
src/xbt/exception.cpp
+++ b/
src/xbt/exception.cpp
@@
-1,5
+1,4
@@
-/* Copyright (c) 2005-2017. The SimGrid Team.
- * All rights reserved. */
+/* Copyright (c) 2005-2018. The SimGrid Team. All rights reserved. */
/* This program is free software; you can redistribute it and/or modify it
* under the terms of the license (GNU LGPL) which comes with this package. */
/* This program is free software; you can redistribute it and/or modify it
* under the terms of the license (GNU LGPL) which comes with this package. */
@@
-21,10
+20,8
@@
#include <xbt/log.h>
#include <xbt/log.hpp>
#include <xbt/log.h>
#include <xbt/log.hpp>
-extern "C" {
XBT_LOG_EXTERNAL_CATEGORY(xbt);
XBT_LOG_NEW_DEFAULT_SUBCATEGORY(xbt_exception, xbt, "Exceptions");
XBT_LOG_EXTERNAL_CATEGORY(xbt);
XBT_LOG_NEW_DEFAULT_SUBCATEGORY(xbt_exception, xbt, "Exceptions");
-}
namespace simgrid {
namespace xbt {
namespace simgrid {
namespace xbt {
@@
-38,8
+35,7
@@
void logException(
try {
auto name = simgrid::xbt::demangle(typeid(exception).name());
try {
auto name = simgrid::xbt::demangle(typeid(exception).name());
- auto with_context =
- dynamic_cast<const simgrid::xbt::WithContextException*>(&exception);
+ auto* with_context = dynamic_cast<const simgrid::xbt::WithContextException*>(&exception);
if (with_context != nullptr)
XBT_LOG(prio, "%s %s by %s/%d: %s",
context, name.get(),
if (with_context != nullptr)
XBT_LOG(prio, "%s %s by %s/%d: %s",
context, name.get(),
@@
-57,7
+53,7
@@
void logException(
}
// Do we have a nested exception?
}
// Do we have a nested exception?
- auto with_nested = dynamic_cast<const std::nested_exception*>(&exception);
+ auto
*
with_nested = dynamic_cast<const std::nested_exception*>(&exception);
if (with_nested == nullptr || with_nested->nested_ptr() == nullptr)
return;
try {
if (with_nested == nullptr || with_nested->nested_ptr() == nullptr)
return;
try {