X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/cfc676704bebcd57e5ea98bb43154245a150948f..40c3dfd364c97e63cabebcf94af76ff53fc5be05:/include/xbt/base.h

diff --git a/include/xbt/base.h b/include/xbt/base.h
index d266b5ad3a..259c84c893 100644
--- a/include/xbt/base.h
+++ b/include/xbt/base.h
@@ -1,7 +1,6 @@
-/* xbt.h - Public interface to the xbt (simgrid's toolbox)                     */
+/* xbt.h - Public interface to the xbt (simgrid's toolbox)                  */
 
-/* Copyright (c) 2004-2015. The SimGrid Team.
- * All rights reserved.                                                     */
+/* Copyright (c) 2004-2015. The SimGrid Team. All rights reserved.          */
 
 /* This program is free software; you can redistribute it and/or modify it
  * under the terms of the license (GNU LGPL) which comes with this package. */
@@ -9,41 +8,46 @@
 #ifndef XBT_BASE_H
 #define XBT_BASE_H
 
-#include "simgrid_config.h"
-
 /* Define _GNU_SOURCE for getline, isfinite, etc. */
 #ifndef _GNU_SOURCE
   #define _GNU_SOURCE
 #endif
 
-/* Attributes are only in recent versions of GCC */
-#if defined(__GNUC__) && (__GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ > 4))
+// Teach the compiler that some code path is unreacheable:
+#if defined(__has_builtin)
+  #if __has_builtin(__builtin_unreachable)
+    #define XBT_UNREACHABLE() __builtin_unreachable()
+  #else
+    #include <stdlib.h>
+    #define XBT_UNREACHABLE() abort()
+  #endif
+#elif (__GNUC__ > 4) || (__GNUC__ == 4 && __GNUC_MINOR__ >= 5)
+  #define XBT_UNREACHABLE() __builtin_unreachable()
+#else
+  #include <stdlib.h>
+  #define XBT_UNREACHABLE() abort()
+#endif
 
 /* On MinGW, stdio.h defines __MINGW_PRINTF_FORMAT and __MINGW_SCANF_FORMAT
    which are the suitable format style (either gnu_printf or ms_printf)
    depending on which version is available (__USE_MINGW_ANSI_STDIO): */
 #ifdef __MINGW32__
   #include <stdio.h>
-#endif
 
-#if defined(__MINGW32__) && defined(__MINGW_PRINTF_FORMAT)
   # define XBT_ATTRIB_PRINTF( format_idx, arg_idx )    \
      __attribute__((__format__ (__MINGW_PRINTF_FORMAT, format_idx, arg_idx)))
-#else
-  # define XBT_ATTRIB_PRINTF( format_idx, arg_idx )    \
-     __attribute__((__format__ (__printf__, format_idx, arg_idx)))
-#endif
-
-#if defined(__MINGW32__) && defined(__MINGW_SCANF_FORMAT)
   # define XBT_ATTRIB_SCANF( format_idx, arg_idx )     \
          __attribute__((__MINGW_SCANF_FORMAT (__scanf__, format_idx, arg_idx)))
 #else
+  # define XBT_ATTRIB_PRINTF( format_idx, arg_idx )    \
+     __attribute__((__format__ (__printf__, format_idx, arg_idx)))
   # define XBT_ATTRIB_SCANF( format_idx, arg_idx )     \
          __attribute__((__format__ (__scanf__, format_idx, arg_idx)))
 #endif
 
 # define XBT_ATTRIB_NORETURN __attribute__((__noreturn__))
 # define XBT_ATTRIB_UNUSED  __attribute__((__unused__))
+# define XBT_ATTRIB_DEPRECATED(m)  __attribute__((__deprecated__(m)))
 
 /* Constructor priorities exist since gcc 4.3.  Apparently, they are however not
  * supported on Macs. */
@@ -56,35 +60,6 @@
 # endif
 # undef _XBT_NEED_INIT_PRAGMA
 
-#elif defined(_MSC_VER) /* Microsoft Visual Thing */
-# define XBT_ATTRIB_PRINTF( format_idx, arg_idx )
-# define XBT_ATTRIB_SCANF( format_idx, arg_idx )
-# define XBT_ATTRIB_NORETURN __declspec(noreturn)
-# define XBT_ATTRIB_UNUSED
-# define _XBT_GNUC_CONSTRUCTOR(prio)
-# define _XBT_GNUC_DESTRUCTOR(prio)
-# define _XBT_NEED_INIT_PRAGMA 1
-#else
-# define XBT_ATTRIB_PRINTF( format_idx, arg_idx )
-# define XBT_ATTRIB_SCANF( format_idx, arg_idx )
-# define XBT_ATTRIB_NORETURN
-# define XBT_ATTRIB_UNUSED
-# define _XBT_GNUC_CONSTRUCTOR(prio)
-# define _XBT_GNUC_DESTRUCTOR(prio)
-# define _XBT_NEED_INIT_PRAGMA 1
-
-#endif                          /* gcc or MSVC else */
-
-/* inline and __FUNCTION__ are only in GCC when -ansi is off */
-
-#if defined(__GNUC__) && ! defined(__STRICT_ANSI__)
-# define _XBT_FUNCTION __FUNCTION__
-#elif (defined(__STDC__) && defined(__STDC_VERSION__) && __STDC_VERSION__ >= 199901L)
-# define _XBT_FUNCTION __func__ /* ISO-C99 compliant */
-#else
-# define _XBT_FUNCTION "function"
-#endif
-
 #if defined(__GNUC__)
 #   define XBT_ALWAYS_INLINE inline __attribute__ ((always_inline))
 #else
@@ -93,8 +68,6 @@
 
 #if defined(__GNUC__)
 #   define XBT_THREAD_LOCAL __thread
-#elif defined(_MSC_VER)
-#   define XBT_THREAD_LOCAL __declspec(thread)
 #else
 #   define XBT_THREAD_LOCAL No thread local on this architecture
 #endif
@@ -195,21 +168,14 @@
 #  define XBT_IMPORT_NO_EXPORT(type)  type
 #  define XBT_PUBLIC_DATA(type)       extern type
 #  define XBT_PUBLIC_CLASS            class
-#  define XBT_PRIVATE
-
-#endif
+#  define XBT_PRIVATE                 /** @private */
 
-#if !defined (max) && !defined(__cplusplus)
-#  define max(a,b)  (((a) > (b)) ? (a) : (b))
-#endif
-#if !defined (min) && !defined(__cplusplus)
-#  define min(a,b)  (((a) < (b)) ? (a) : (b))
 #endif
 
 #define TRUE  1
 #define FALSE 0
 
-/*! C++ users need love */
+/* C++ users need love */
 #ifndef SG_BEGIN_DECL
 # ifdef __cplusplus
 #  define SG_BEGIN_DECL() extern "C" {