Merge branch 'master' of scm.gforge.inria.fr:/gitroot/simgrid/simgrid into tomerge

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

diff --git a/include/xbt/sysdep.h b/include/xbt/sysdep.h
index f464edd..48476d9 100644 (file)
--- a/include/xbt/sysdep.h
+++ b/include/xbt/sysdep.h
@@ -11,6 +11,10 @@
 #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"
@@ -74,11 +78,7 @@ char *xbt_strdup(const char *s)
 {
   char *res = NULL;
   if (s) {
-# if !defined(_XBT_WIN32)
     res = strdup(s);
-# else
-    res = _strdup(s);
-# endif
     if (!res)
       xbt_die("memory allocation error (strdup returned NULL)");
   }
@@ -138,11 +138,7 @@ void *xbt_realloc(void *p, size_t s)
   return res;
 }
 #else                           /* non __GNUC__  */
-#  if !defined(_XBT_WIN32)
-#    define xbt_strdup(s)    strdup(s)
-#  else
-#    define xbt_strdup(s)    _strdup(s)
-#  endif
+#  define xbt_strdup(s)    strdup(s)
 #  define xbt_malloc(n)    malloc(n)
 #  define xbt_malloc0(n)   calloc(n,1)
 #  define xbt_realloc(p,s) realloc(p,s)
@@ -157,15 +153,44 @@ 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 */