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
__func__ is C99 for __FUNCTION__. Kill portability layer
[simgrid.git]
/
include
/
xbt
/
ex.h
diff --git
a/include/xbt/ex.h
b/include/xbt/ex.h
index
8ca0a18
..
156c820
100644
(file)
--- a/
include/xbt/ex.h
+++ b/
include/xbt/ex.h
@@
-435,7
+435,7
@@
XBT_PUBLIC( void )__xbt_ex_terminate_default(xbt_ex_t * e);
_throw_ctx->exception.pid = xbt_getpid(); \
_throw_ctx->exception.file = (char*)__FILE__; \
_throw_ctx->exception.line = __LINE__; \
_throw_ctx->exception.pid = xbt_getpid(); \
_throw_ctx->exception.file = (char*)__FILE__; \
_throw_ctx->exception.line = __LINE__; \
- _throw_ctx->exception.func = (char*)_
XBT_FUNCTION;
\
+ _throw_ctx->exception.func = (char*)_
_func__;
\
_throw_ctx->exception.bt_strings = NULL; \
xbt_backtrace_current((xbt_ex_t *)&(_throw_ctx->exception));
_throw_ctx->exception.bt_strings = NULL; \
xbt_backtrace_current((xbt_ex_t *)&(_throw_ctx->exception));
@@
-457,9
+457,9
@@
XBT_PUBLIC( void )__xbt_ex_terminate_default(xbt_ex_t * e);
#define THROW_IMPOSSIBLE \
THROWF(unknown_error, 0, "The Impossible Did Happen (yet again)")
#define THROW_UNIMPLEMENTED \
#define THROW_IMPOSSIBLE \
THROWF(unknown_error, 0, "The Impossible Did Happen (yet again)")
#define THROW_UNIMPLEMENTED \
- THROWF(unknown_error, 0, "Function %s unimplemented",_
XBT_FUNCTION
)
+ THROWF(unknown_error, 0, "Function %s unimplemented",_
_func__
)
#define THROW_DEADCODE \
#define THROW_DEADCODE \
- THROWF(unknown_error, 0, "Function %s was supposed to be DEADCODE, but it's not",_
XBT_FUNCTION
)
+ THROWF(unknown_error, 0, "Function %s was supposed to be DEADCODE, but it's not",_
_func__
)
#define DIE_IMPOSSIBLE xbt_die("The Impossible Did Happen (yet again)")
#define DIE_IMPOSSIBLE xbt_die("The Impossible Did Happen (yet again)")