From 7d88947492241c86e64ea1191b2c078d98f9a500 Mon Sep 17 00:00:00 2001 From: Adam Mitz Date: Mon, 3 Oct 2022 14:50:02 -0500 Subject: fixed merge --- ACE/ace/config-g++-common.h | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/ACE/ace/config-g++-common.h b/ACE/ace/config-g++-common.h index bf94f816d79..219f549a20d 100644 --- a/ACE/ace/config-g++-common.h +++ b/ACE/ace/config-g++-common.h @@ -31,6 +31,12 @@ # define ACE_HAS_NEW_NOTHROW #endif /* __GNUC__ >= 3.3 */ +#if __cplusplus >= 202002L +# define ACE_HAS_CPP20 +#endif +#if __cplusplus >= 201703L +# define ACE_HAS_CPP17 +# define ACE_FALLTHROUGH [[fallthrough]] #endif #if __cplusplus >= 201402L # define ACE_HAS_CPP14 @@ -42,7 +48,7 @@ # define ACE_FALLTHROUGH [[gnu::fallthrough]] # else # define ACE_FALLTHROUGH -# endif +# endif # endif #endif -- cgit v1.2.1