X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/814988d3bff7171e6aeb7a5ac328b2c511195d9f..94bbf4f893b0b58419d77d2ebf29b96918489440:/include/xbt/base.h

diff --git a/include/xbt/base.h b/include/xbt/base.h
index 871debae61..bd19a3272f 100644
--- a/include/xbt/base.h
+++ b/include/xbt/base.h
@@ -13,7 +13,7 @@
 #  define _GNU_SOURCE
 #endif
 
-// Teach the compiler that some code path is unreacheable:
+// Teach the compiler that some code path is unreachable:
 #if defined(__has_builtin)
 #  if __has_builtin(__builtin_unreachable)
 #    define XBT_UNREACHABLE() __builtin_unreachable()
@@ -68,12 +68,10 @@
 #define XBT_ATTRIB_DEPRECATED(mesg) __attribute__((deprecated(mesg)))
 #endif
 
-#define XBT_ATTRIB_DEPRECATED_v325(mesg)                                                                               \
-  XBT_ATTRIB_DEPRECATED(mesg " (this compatibility wrapper will be dropped in v3.25)") /* Will be dropped in v3.25 */
-#define XBT_ATTRIB_DEPRECATED_v327(mesg)                                                                               \
-  XBT_ATTRIB_DEPRECATED(mesg " (this compatibility wrapper will be dropped in v3.27)") /* Will be dropped in v3.27 */
 #define XBT_ATTRIB_DEPRECATED_v328(mesg)                                                                               \
-  XBT_ATTRIB_DEPRECATED(mesg " (this compatibility wrapper will be dropped in v3.28)") /* Will be dropped in v3.28 */
+  XBT_ATTRIB_DEPRECATED(mesg " (this compatibility wrapper will be dropped in v3.28)")
+#define XBT_ATTRIB_DEPRECATED_v329(mesg)                                                                               \
+  XBT_ATTRIB_DEPRECATED(mesg " (this compatibility wrapper will be dropped in v3.29)")
 
 #if !defined(__APPLE__)
 #  define XBT_ATTRIB_CONSTRUCTOR(prio) __attribute__((__constructor__(prio)))
@@ -97,7 +95,7 @@
 /* Concatenate arguments. _XBT_CONCAT2 adds a level of indirection over _XBT_CONCAT. */
 #define _XBT_CONCAT(a, b) a##b
 #define _XBT_CONCAT2(a, b) _XBT_CONCAT(a, b)
-#define _XBT_CONCAT3(a, b, c) _XBT_CONCAT2(_XBT_CONCAT(a, b), c)
+#define _XBT_CONCAT3(a, b, c) _XBT_CONCAT2(_XBT_CONCAT2(a, b), c)
 #define _XBT_CONCAT4(a, b, c, d) _XBT_CONCAT2(_XBT_CONCAT3(a, b, c), d)
 
 /*
@@ -188,17 +186,17 @@
 /* C++ users need love */
 #ifndef SG_BEGIN_DECL
 # ifdef __cplusplus
-#  define SG_BEGIN_DECL() extern "C" {
+#  define SG_BEGIN_DECL extern "C" {
 # else
-#  define SG_BEGIN_DECL()
+#  define SG_BEGIN_DECL
 # endif
 #endif
 
 #ifndef SG_END_DECL
 # ifdef __cplusplus
-#  define SG_END_DECL() }
+#  define SG_END_DECL }
 # else
-#  define SG_END_DECL()
+#  define SG_END_DECL
 # endif
 #endif
 /* End of cruft for C++ */