Merge branch 'master' into fix/execute_benched

[simgrid.git] / include / xbt / ex.h

diff --git a/include/xbt/ex.h b/include/xbt/ex.h
index 6307177..78ade07 100644 (file)
--- a/include/xbt/ex.h
+++ b/include/xbt/ex.h
@@ -1,4 +1,4 @@
-/* Copyright (c) 2005-2015. The SimGrid Team.
+/* Copyright (c) 2005-2017. The SimGrid Team.
  * All rights reserved.                                                     */
 
 /*  Copyright (c) 2002-2004 Ralf S. Engelschall <rse@engelschall.com>       */
@@ -50,30 +50,6 @@
 #include "xbt/misc.h"
 #include "xbt/virtu.h"
 
-/*-*-* Emergency debuging: define this when the exceptions get crazy *-*-*/
-#undef __EX_MAYDAY
-#ifdef __EX_MAYDAY
-# include <stdio.h>
-#include <errno.h>
-#  define MAYDAY_SAVE(m)    printf("%d %s:%d save %p\n",                \
-                                   xbt_getpid(), __FILE__, __LINE__,    \
-                                   (m)->jb                              \
-                                  ),
-#  define MAYDAY_RESTORE(m) printf("%d %s:%d restore %p\n",             \
-                                   xbt_getpid(), __FILE__, __LINE__,    \
-                                   (m)->jb                              \
-                                  ),
-#  define MAYDAY_CATCH(e)   printf("%d %s:%d Catched '%s'\n",           \
-                                   xbt_getpid(), __FILE__, __LINE__,    \
-                                   (e).msg                              \
-          ),
-#else
-#  define MAYDAY_SAVE(m)
-#  define MAYDAY_RESTORE(m)
-#  define MAYDAY_CATCH(e)
-#endif
-/*-*-* end of debugging stuff *-*-*/
-
 /** @addtogroup XBT_ex_c
  *  @brief Exceptions support (C)
  *
@@ -116,7 +92,8 @@ XBT_PUBLIC(const char *) xbt_ex_catname(xbt_errcat_t cat);
 typedef struct xbt_ex xbt_ex_t;
 
 /** Helper function used to throw exceptions in C */
-XBT_PUBLIC(void) _xbt_throw(char* message, xbt_errcat_t errcat, int value, const char* file, int line, const char* func) XBT_ATTRIB_NORETURN;
+XBT_ATTRIB_NORETURN XBT_PUBLIC(void)
+    _xbt_throw(char* message, xbt_errcat_t errcat, int value, const char* file, int line, const char* func);
 
 /** Builds and throws an exception
  *  @ingroup XBT_ex_c