X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/13fcf118a0aa6eb2c46a8a1a29b8aa586302374f..54c2fb5c3ed10651806b29ebba5fc339b3909254:/include/xbt/asserts.h

diff --git a/include/xbt/asserts.h b/include/xbt/asserts.h
index 479eb60946..18fced6643 100644
--- a/include/xbt/asserts.h
+++ b/include/xbt/asserts.h
@@ -1,7 +1,7 @@
-/* $Id$ */
 /*  xbt/asserts.h -- assertion mecanism                                     */
 
-/* Copyright (c) 2004,2005 Martin Quinson. All rights reserved.             */
+/* Copyright (c) 2005, 2006, 2007, 2009, 2010. 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. */
@@ -10,14 +10,17 @@
 #define _XBT_ASSERTS_H
 
 #include "xbt/misc.h"
-  
-BEGIN_DECL()
+#include "xbt/log.h"
+#include "xbt/ex.h"
+
+SG_BEGIN_DECL()
 
 /**
- * \name 4. assert macro familly
+ * @addtogroup XBT_error
+ * @brief Those are the SimGrid version of the good ol' assert macro.
  *
- * Those are the GRAS version of the good ol' assert macro. You can pass them a format message and
- * arguments, just as if it where a printf. It is converted to a CRITICALn logging request.
+ * You can pass them a format message and arguments, just as if it where a printf.
+ * It is converted to a CRITICALn logging request.
  *
  * @{
  */
@@ -33,28 +36,22 @@ BEGIN_DECL()
 #else
      /** @brief The condition which failed will be displayed.
 	 @hideinitializer  */
-#define xbt_assert(cond)                  if (!(cond)) { CRITICAL1("Assertion %s failed", #cond); xbt_abort(); }
+#define xbt_assert(cond)                  do { if (!(cond)) THROW1(0,0,"Assertion %s failed", #cond); } while (0)
      /** @hideinitializer  */
-#define xbt_assert0(cond,msg)             if (!(cond)) { CRITICAL0(msg); xbt_abort(); }
+#define xbt_assert0(cond,msg)             do { if (!(cond)) THROW0(0,0,msg); } while (0)
      /** @hideinitializer  */
-#define xbt_assert1(cond,msg,a)           if (!(cond)) { CRITICAL1(msg,a); xbt_abort(); }
+#define xbt_assert1(cond,msg,a)           do { if (!(cond)) THROW1(0,0,msg,a); } while (0)
      /** @hideinitializer  */
-#define xbt_assert2(cond,msg,a,b)         if (!(cond)) { CRITICAL2(msg,a,b); xbt_abort(); }
+#define xbt_assert2(cond,msg,a,b)         do { if (!(cond)) THROW2(0,0,msg,a,b); } while (0)
      /** @hideinitializer  */
-#define xbt_assert3(cond,msg,a,b,c)       if (!(cond)) { CRITICAL3(msg,a,b,c); xbt_abort(); }
+#define xbt_assert3(cond,msg,a,b,c)       do { if (!(cond)) THROW3(0,0,msg,a,b,c); } while (0)
      /** @hideinitializer  */
-#define xbt_assert4(cond,msg,a,b,c,d)     if (!(cond)) { CRITICAL4(msg,a,b,c,d); xbt_abort(); }
+#define xbt_assert4(cond,msg,a,b,c,d)     do { if (!(cond)) THROW4(0,0,msg,a,b,c,d); } while (0)
      /** @hideinitializer  */
-#define xbt_assert5(cond,msg,a,b,c,d,e)   if (!(cond)) { CRITICAL5(msg,a,b,c,d,e); xbt_abort(); }
+#define xbt_assert5(cond,msg,a,b,c,d,e)   do { if (!(cond)) THROW5(0,0,msg,a,b,c,d,e); } while (0)
      /** @hideinitializer  */
-#define xbt_assert6(cond,msg,a,b,c,d,e,f) if (!(cond)) { CRITICAL6(msg,a,b,c,d,e,f); xbt_abort(); }
+#define xbt_assert6(cond,msg,a,b,c,d,e,f) do { if (!(cond)) THROW6(0,0,msg,a,b,c,d,e,f); } while (0)
 #endif
-     
 /** @} */
-     
-void xbt_abort(void) _XBT_GNUC_NORETURN;
-void xbt_die(const char *msg) _XBT_GNUC_NORETURN;
-  
-END_DECL()
-
-#endif /* _XBT_ASSERTS_H */
+    SG_END_DECL()
+#endif                          /* _XBT_ASSERTS_H */