X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/4ef5edef3b76faa2a25e2d9a4940389b28385969..bba94ebba0c4a3034af09e75e67a54144cf19df5:/include/xbt/sysdep.h

diff --git a/include/xbt/sysdep.h b/include/xbt/sysdep.h
index 26897c40c8..9ed7c53e13 100644
--- a/include/xbt/sysdep.h
+++ b/include/xbt/sysdep.h
@@ -2,7 +2,7 @@
 /*  no system header should be loaded out of this file so that we have only */
 /*  one file to check when porting to another OS                            */
 
-/* Copyright (c) 2004-2014. The SimGrid Team.
+/* Copyright (c) 2004-2015. The SimGrid Team.
  * All rights reserved.                                                     */
 
 /* This program is free software; you can redistribute it and/or modify it
@@ -11,18 +11,22 @@
 #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"
 
 #include "simgrid_config.h"
 
+SG_BEGIN_DECL()
+
 #include <string.h>
 #include <stdlib.h>
 #include <stdarg.h>             /* va_list */
 
-SG_BEGIN_DECL()
-
 /* They live in asserts.h, but need to be declared before this module.
    double declaration to cut dependency cycle */
 /**
@@ -74,16 +78,7 @@ char *xbt_strdup(const char *s)
 {
   char *res = NULL;
   if (s) {
-# if defined(SIMGRID_HAVE_STRDUP)
     res = strdup(s);
-# elif defined(SIMGRID_HAVE__STRDUP)
-    res = _strdup(s);
-# else
-    size_t len  = strlen(s);
-    res = malloc(len + 1);
-    if (res)
-      memcpy(res, s, len + 1);
-#  endif
     if (!res)
       xbt_die("memory allocation error (strdup returned NULL)");
   }
@@ -143,13 +138,7 @@ void *xbt_realloc(void *p, size_t s)
   return res;
 }
 #else                           /* non __GNUC__  */
-#  if defined(SIMGRID_HAVE_STRDUP)
-#    define xbt_strdup(s)    strdup(s)
-#  elif defined(SIMGRID_HAVE__STRDUP
-#    define xbt_strdup(s)    _strdup(s)
-#  else
-#    error Missing strdup
-#  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)
@@ -164,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 */