Merge "static_assert is a keyword in C23." am: 0122e010a9
am: fac1bd05cd
am: c46801ed09
Original change: https://android-review.googlesource.com/c/platform/bionic/+/2602945 Change-Id: I93fb54bda5edd42e215ea6bb1b3b7c9f8a61ef95 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
commit
733480749e
1 changed files with 2 additions and 1 deletions
|
@ -64,7 +64,8 @@
|
||||||
# endif
|
# endif
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#if !defined(__cplusplus) && __STDC_VERSION__ >= 201112L
|
/* `static_assert` is a keyword in C++11 and C23; C11 had `_Static_assert` instead. */
|
||||||
|
#if !defined(__cplusplus) && (__STDC_VERSION__ >= 201112L && __STDC_VERSION__ < 202311L)
|
||||||
# undef static_assert
|
# undef static_assert
|
||||||
# define static_assert _Static_assert
|
# define static_assert _Static_assert
|
||||||
#endif
|
#endif
|
||||||
|
|
Loading…
Reference in a new issue