Deactivate this assert again.

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

diff --git a/include/xbt/log.h b/include/xbt/log.h
index 53fef8c..dbc545a 100644 (file)
--- a/include/xbt/log.h
+++ b/include/xbt/log.h
@@ -18,7 +18,7 @@
  *     
  *  This is the list of all existing log categories in SimGrid.
  *  This list was automatically extracted from the source code by
- *  the src/xbt_log_extract_hierarchy utility.
+ *  the tools/doxygen/xbt_log_extract_hierarchy.pl utility.
  *     
  *  You can thus be certain that it is uptodate, but it may somehow
  *  lack a final manual touch.
@@ -35,6 +35,7 @@
 
 #include "xbt/misc.h"
 #include <stdarg.h>
+#include <stddef.h>             /* NULL */
 SG_BEGIN_DECL()
 /**\brief Log priorities
  * \ingroup XBT_log
@@ -125,8 +126,8 @@ typedef enum {
 # define XBT_LOG_CONNECT(child, parent_cat)                             \
   if (1) {                                                              \
     XBT_LOG_EXTERNAL_CATEGORY(child);                                   \
-    XBT_LOG_EXTERNAL_CATEGORY(parent_cat);                              \
-    xbt_assert(_XBT_LOGV(child).parent == &_XBT_LOGV(parent_cat));      \
+    /* XBT_LOG_EXTERNAL_CATEGORY(parent_cat); */                        \
+    /* xbt_assert(_XBT_LOGV(child).parent == &_XBT_LOGV(parent_cat)); */ \
     _xbt_log_cat_init(&_XBT_LOGV(child), xbt_log_priority_uninitialized); \
   } else ((void)0)
 #endif