From a62b64d7cff5f86059bf7ec5df2d4f60a61a827b Mon Sep 17 00:00:00 2001 From: Martin Quinson Date: Fri, 6 May 2016 10:53:52 +0200 Subject: [PATCH] remove an useless pimple around exceptions --- src/simix/smx_private.h | 2 -- src/simix/smx_process.cpp | 2 +- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/src/simix/smx_private.h b/src/simix/smx_private.h index 0f1c7bf834..0e542ca3e8 100644 --- a/src/simix/smx_private.h +++ b/src/simix/smx_private.h @@ -88,8 +88,6 @@ XBT_PUBLIC(void) SIMIX_clean(void); _smx_throw_issuer->doexception = 1; \ } else ((void)0) -#define SMX_THROW() RETHROW - /* ******************************** File ************************************ */ typedef struct s_smx_file { surf_file_t surf_file; diff --git a/src/simix/smx_process.cpp b/src/simix/smx_process.cpp index 93c852ed1f..2fb0858549 100644 --- a/src/simix/smx_process.cpp +++ b/src/simix/smx_process.cpp @@ -1021,7 +1021,7 @@ void SIMIX_process_yield(smx_process_t self) if (self->doexception) { XBT_DEBUG("Wait, maestro left me an exception"); self->doexception = 0; - SMX_THROW(); + RETHROW; } if(SMPI_switch_data_segment && self->segment_index != -1){ -- 2.20.1