summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSebastian Huber <sebastian.huber@embedded-brains.de>2012-11-04 19:56:34 +0100
committerSebastian Huber <sebastian.huber@embedded-brains.de>2012-11-06 10:20:42 +0100
commite278f8b7d9456cb7d051da06a4b011b9568831dc (patch)
tree8918187182945387d09d545fe24f2d49a97d66ee
parentRemove rtems-rfs-bitmaps-ut.c. (diff)
downloadrtems-e278f8b7d9456cb7d051da06a4b011b9568831dc.tar.bz2
score: Support static_assert and _Static_assert
-rw-r--r--cpukit/score/include/rtems/score/basedefs.h12
1 files changed, 10 insertions, 2 deletions
diff --git a/cpukit/score/include/rtems/score/basedefs.h b/cpukit/score/include/rtems/score/basedefs.h
index 1f8660cb9b..8239994c03 100644
--- a/cpukit/score/include/rtems/score/basedefs.h
+++ b/cpukit/score/include/rtems/score/basedefs.h
@@ -163,8 +163,16 @@
#define RTEMS_COMPILER_DEPRECATED_ATTRIBUTE
#endif
-#define RTEMS_STATIC_ASSERT(cond, msg) \
- typedef int rtems_static_assert_ ## msg [(cond) ? 1 : -1]
+#if __cplusplus >= 201103L
+ #define RTEMS_STATIC_ASSERT(cond, msg) \
+ static_assert(cond, # msg)
+#elif __STDC_VERSION__ >= 201112L
+ #define RTEMS_STATIC_ASSERT(cond, msg) \
+ _Static_assert(cond, # msg)
+#else
+ #define RTEMS_STATIC_ASSERT(cond, msg) \
+ typedef int rtems_static_assert_ ## msg [(cond) ? 1 : -1]
+#endif
#ifndef ASM
#ifdef RTEMS_DEPRECATED_TYPES