From a1ebe7716676048318688a629fd2da0c182ef164 Mon Sep 17 00:00:00 2001 From: Martin Quinson Date: Mon, 14 Sep 2015 14:18:02 +0200 Subject: [PATCH] MSCV also define _THROW, so pick another name for our internal macro --- include/xbt/ex.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/include/xbt/ex.h b/include/xbt/ex.h index c05905606f..9ae8f84766 100644 --- a/include/xbt/ex.h +++ b/include/xbt/ex.h @@ -429,7 +429,7 @@ XBT_PUBLIC( void )__xbt_ex_terminate_default(xbt_ex_t * e); _throw_ctx->exception.bt_strings = NULL; \ xbt_backtrace_current((xbt_ex_t *)&(_throw_ctx->exception)); -#define _THROW(c, v, m) \ +#define _XBT_THROW(c, v, m) \ do { /* change this sequence into one block */ \ xbt_running_ctx_t *_throw_ctx = __xbt_running_ctx_fetch(); \ THROW_PREPARE(_throw_ctx, c, v, m); \ @@ -438,11 +438,11 @@ XBT_PUBLIC( void )__xbt_ex_terminate_default(xbt_ex_t * e); /** @brief Builds and throws an exception @hideinitializer */ -#define THROW(c, v) _THROW(c, v, NULL) +#define THROW(c, v) _XBT_THROW(c, v, NULL) /** @brief Builds and throws an exception with a printf-like formatted message @hideinitializer */ -#define THROWF(c, v, ...) _THROW(c, v, bprintf(__VA_ARGS__)) +#define THROWF(c, v, ...) _XBT_THROW(c, v, bprintf(__VA_ARGS__)) #define THROW_IMPOSSIBLE \ THROWF(unknown_error, 0, "The Impossible Did Happen (yet again)") -- 2.20.1