#ifdef XBT_LOG_LOCALLY_DEFINE_XBT_CHANNEL
XBT_LOG_NEW_CATEGORY(xbt, "All XBT categories (simgrid toolbox)");
+XBT_LOG_NEW_SUBCATEGORY(xbt_help, xbt, "Help messages");
#else
XBT_LOG_EXTERNAL_CATEGORY(xbt);
+XBT_LOG_EXTERNAL_CATEGORY(xbt_help);
#endif
/** @addtogroup XBT_syscall
#define xbt_free(p) free(p) /*nothing specific to do here. A poor valgrind replacement? */
#ifdef __cplusplus
-#define XBT_FREE_NOEXCEPT noexcept(noexcept(std::free))
+#define XBT_FREE_NOEXCEPT noexcept(noexcept(::free))
#else
#define XBT_FREE_NOEXCEPT
#endif