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' into CRTP
[simgrid.git]
/
include
/
xbt
/
asserts.h
diff --git
a/include/xbt/asserts.h
b/include/xbt/asserts.h
index 5e78a3bfe200ad6dafa011238495b7c2fc6768c8..585b1238fed19e675f0f82e88a64464735eecd57 100644
(file)
--- a/
include/xbt/asserts.h
+++ b/
include/xbt/asserts.h
@@
-1,6
+1,6
@@
/* xbt/asserts.h -- assertion mechanism */
/* xbt/asserts.h -- assertion mechanism */
-/* Copyright (c) 2005-201
8
. The SimGrid Team. All rights reserved. */
+/* Copyright (c) 2005-201
9
. 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. */
@@
-15,6
+15,8
@@
SG_BEGIN_DECL()
XBT_PUBLIC_DATA int xbt_log_no_loc; /* Do not show the backtrace on failed backtrace when doing our tests */
SG_BEGIN_DECL()
XBT_PUBLIC_DATA int xbt_log_no_loc; /* Do not show the backtrace on failed backtrace when doing our tests */
+XBT_PUBLIC void xbt_backtrace_display_current();
+
/**
* @addtogroup XBT_error
* @brief Those are the SimGrid version of the good ol' assert macro.
/**
* @addtogroup XBT_error
* @brief Those are the SimGrid version of the good ol' assert macro.
@@
-33,8
+35,7
@@
XBT_PUBLIC_DATA int xbt_log_no_loc; /* Do not show the backtrace on failed backt
@hideinitializer */
#define xbt_assert(...) \
_XBT_IF_ONE_ARG(_xbt_assert_ARG1, _xbt_assert_ARGN, __VA_ARGS__)(__VA_ARGS__)
@hideinitializer */
#define xbt_assert(...) \
_XBT_IF_ONE_ARG(_xbt_assert_ARG1, _xbt_assert_ARGN, __VA_ARGS__)(__VA_ARGS__)
-#define _xbt_assert_ARG1(cond) \
- _xbt_assert_ARGN(cond, "Assertion %s failed", #cond)
+#define _xbt_assert_ARG1(cond) _xbt_assert_ARGN((cond), "Assertion %s failed", #cond)
#define _xbt_assert_ARGN(cond, ...) \
do { \
if (!(cond)) { \
#define _xbt_assert_ARGN(cond, ...) \
do { \
if (!(cond)) { \