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 'models_type_rework_part2_try2' into 'master'
[simgrid.git]
/
include
/
xbt
/
asserts.h
diff --git
a/include/xbt/asserts.h
b/include/xbt/asserts.h
index
30d9a34
..
1357531
100644
(file)
--- a/
include/xbt/asserts.h
+++ b/
include/xbt/asserts.h
@@
-1,20
+1,21
@@
/* xbt/asserts.h -- assertion mechanism */
/* xbt/asserts.h -- assertion mechanism */
-/* Copyright (c) 2005-2007, 2009-2014. The SimGrid Team.
- * All rights reserved. */
+/* Copyright (c) 2005-2021. 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. */
-#ifndef
_
XBT_ASSERTS_H
-#define
_
XBT_ASSERTS_H
+#ifndef XBT_ASSERTS_H
+#define XBT_ASSERTS_H
-#include
"xbt/misc.h"
-#include
"xbt/log.h"
-#include
"xbt/ex.h"
+#include
<xbt/ex.h>
+#include
<xbt/log.h>
+#include
<xbt/misc.h>
-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
/**
* @addtogroup XBT_error
@@
-34,8
+35,7
@@
XBT_PUBLIC_DATA(int) xbt_log_no_loc; /* Do not show the backtrace on failed back
@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)) { \
@@
-48,5
+48,5
@@
XBT_PUBLIC_DATA(int) xbt_log_no_loc; /* Do not show the backtrace on failed back
#endif
/** @} */
#endif
/** @} */
-SG_END_DECL
()
-#endif /*
_
XBT_ASSERTS_H */
+SG_END_DECL
+#endif /* XBT_ASSERTS_H */