From 5467f5b5ca6f2302573649b4a4f897793a9a6e7f Mon Sep 17 00:00:00 2001 From: Jonathan Wakely Date: Tue, 22 Oct 2024 16:26:27 +0100 Subject: ginclude: stdalign.h should define __xxx_is_defined macros for C++ The __alignas_is_defined macro has been required by C++ since C++11, and C++ Library DR 4036 clarified that __alignof_is_defined should be defined too. The whole header was deprecated for C++23 (see LWG 3827) and is likely to be removed for C++26 (see P3348), but we can deal with that later. The macros alignas and alignof should not be defined, as they're keywords in C++. gcc/ChangeLog: * ginclude/stdalign.h (__alignas_is_defined): Define for C++. (__alignof_is_defined): Likewise. libstdc++-v3/ChangeLog: * testsuite/18_support/headers/cstdalign/macros.cc: New test. --- gcc/ginclude/stdalign.h | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'gcc') diff --git a/gcc/ginclude/stdalign.h b/gcc/ginclude/stdalign.h index 5f82f2d..980b1bb 100644 --- a/gcc/ginclude/stdalign.h +++ b/gcc/ginclude/stdalign.h @@ -26,12 +26,14 @@ see the files COPYING3 and COPYING.RUNTIME respectively. If not, see #ifndef _STDALIGN_H #define _STDALIGN_H -#if (!defined __cplusplus \ - && !(defined __STDC_VERSION__ && __STDC_VERSION__ > 201710L)) +#if !(defined __STDC_VERSION__ && __STDC_VERSION__ > 201710L) +#ifndef __cplusplus #define alignas _Alignas #define alignof _Alignof +#endif +/* These are defined for C++, but deprecated in C++23. */ #define __alignas_is_defined 1 #define __alignof_is_defined 1 -- cgit v1.1