X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/1f27be8ecd303fa9f686a2ca2ad1987cc4658180..ad4d53393fdc8da00b5495852fa51db3fa290943:/include/xbt/log.h diff --git a/include/xbt/log.h b/include/xbt/log.h index c0d9448a9d..d1d7315eff 100644 --- a/include/xbt/log.h +++ b/include/xbt/log.h @@ -113,10 +113,20 @@ typedef enum { */ #if defined(_MSC_VER) # define _XBT_LOG_PARENT_INITIALIZER(parent) NULL -# define XBT_LOG_CONNECT(parent_cat,child) _XBT_LOGV(child).parent = &_XBT_LOGV(parent_cat) +# define XBT_LOG_CONNECT(child, parent_cat) \ + if (1) { \ + XBT_LOG_EXTERNAL_CATEGORY(child); \ + XBT_LOG_EXTERNAL_CATEGORY(parent_cat); \ + _XBT_LOGV(child).parent = &_XBT_LOGV(parent_cat); \ + } else ((void)0) #else # define _XBT_LOG_PARENT_INITIALIZER(parent) &_XBT_LOGV(parent) -# define XBT_LOG_CONNECT(parent_cat,child) /* xbt_assert(_XBT_LOGV(child).parent == &_XBT_LOGV(parent_cat)) */ +# 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)); \ + } else ((void)0) #endif /* XBT_LOG_NEW_SUBCATEGORY_helper: