#ifndef _XBT_SYSDEP_H
#define _XBT_SYSDEP_H
+#ifdef __cplusplus
+#include <type_traits>
+#endif
+
#include "xbt/log.h"
#include "xbt/misc.h"
#include "xbt/asserts.h"
*/
#define xbt_die(...) \
do { \
- XBT_LOG_EXTERNAL_CATEGORY(xbt); \
XBT_CCRITICAL(xbt, __VA_ARGS__); \
xbt_abort(); \
} while (0)
/** @} */
+XBT_LOG_EXTERNAL_CATEGORY(xbt);
+
/* these ones live in str.h, but redeclare them here so that we do
not need to load the whole str.h and its heavy dependencies */
#ifndef __USE_GNU /* do not redeclare existing headers */
/** @brief like free
@hideinitializer */
-#define xbt_free free /*nothing specific to do here. A poor valgrind replacement? */
+#define xbt_free(p) free(p) /*nothing specific to do here. A poor valgrind replacement? */
/** @brief like free, but you can be sure that it is a function */
XBT_PUBLIC(void) xbt_free_f(void *p);
/** @brief should be given a pointer to pointer, and frees the second one */
XBT_PUBLIC(void) xbt_free_ref(void *d);
+SG_END_DECL()
+
/** @brief like calloc, but xbt_die() on error and don't memset to 0
@hideinitializer */
+#ifndef __cplusplus
+
#define xbt_new(type, count) ((type*)xbt_malloc (sizeof (type) * (count)))
/** @brief like calloc, but xbt_die() on error
@hideinitializer */
#define xbt_new0(type, count) ((type*)xbt_malloc0 (sizeof (type) * (count)))
-/** @} */
+#else
+
+/** C++ wrapper for xtb_new
+ *
+ * This ensures that we do not xbt_new things that need a constructor.
+ */
+template<typename T> inline
+T* xbt_new_(size_t count)
+{
+ static_assert(std::is_trivial<T>(),
+ "Cannot xbt_new this type");
+ return (T*) xbt_malloc(sizeof(T) * count);
+}
+template<typename T> inline
+T* xbt_new0_(size_t count)
+{
+ static_assert(std::is_trivial<T>(),
+ "Cannot xbt_new0 this type");
+ return (T*) xbt_malloc0(sizeof(T) * count);
+}
+
+#define xbt_new(type, count) ::xbt_new_<type>(count)
+#define xbt_new0(type, count) ::xbt_new0_<type>(count)
+
+#endif
+
+/** @} */
-SG_END_DECL()
#endif /* _XBT_SYSDEP_H */