X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/fe9f13ea487593ec11c6af50d8150a6743c84114..e76db741f886560cbf49a0dd833b35489c778ac1:/include/xbt/ex.h diff --git a/include/xbt/ex.h b/include/xbt/ex.h index dc31878207..a7b8d0e72b 100644 --- a/include/xbt/ex.h +++ b/include/xbt/ex.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2005-2019. The SimGrid Team. All rights reserved. */ +/* Copyright (c) 2005-2022. 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. */ @@ -16,27 +16,21 @@ /** @addtogroup XBT_ex_c * @brief Exceptions support (C) * - * Those fonctions are used to throw C++ exceptions from C code. This feature + * Those functions are used to throw C++ exceptions from C code. This feature * should probably be removed in the future because C and exception do not * exactly play nicely together. */ -SG_BEGIN_DECL() +SG_BEGIN_DECL /** Helper function used to throw exceptions in C */ -XBT_ATTRIB_NORETURN XBT_PUBLIC void _xbt_throw(char* message, int value, const char* file, int line, const char* func); - -/** Builds and throws an exception - * @ingroup XBT_ex_c - * @hideinitializer - */ -#define THROW(v) _xbt_throw(NULL, (v), __FILE__, __LINE__, __func__) +XBT_ATTRIB_NORETURN XBT_PUBLIC void _xbt_throw(char* message, const char* file, int line, const char* func); /** Builds and throws an exception with a printf-like formatted message * @ingroup XBT_ex_c * @hideinitializer */ -#define THROWF(v, ...) _xbt_throw(bprintf(__VA_ARGS__), (v), __FILE__, __LINE__, __func__) +#define THROW(...) _xbt_throw(bprintf(__VA_ARGS__), __FILE__, __LINE__, __func__) XBT_ATTRIB_NORETURN void xbt_throw_impossible(const char* file, int line, const char* func); /** Throw an exception because something impossible happened @@ -55,7 +49,7 @@ XBT_ATTRIB_NORETURN XBT_PUBLIC void xbt_throw_unimplemented(const char* file, in */ #define DIE_IMPOSSIBLE xbt_die("The Impossible Did Happen (yet again)") -SG_END_DECL() +SG_END_DECL /** @} */ -#endif /* __XBT_EX_H__ */ +#endif /* XBT_EX_H */