diff options
| author | Adam Mitz <mitza@objectcomputing.com> | 2022-10-03 14:50:02 -0500 |
|---|---|---|
| committer | Adam Mitz <mitza@objectcomputing.com> | 2022-10-03 14:50:02 -0500 |
| commit | 7d88947492241c86e64ea1191b2c078d98f9a500 (patch) | |
| tree | b24612663c5572261d8d52bdf24539d6d38795b7 | |
| parent | 8c727cb8f0d7d6a6330e4581db141c6376b91e68 (diff) | |
| download | ATCD-7d88947492241c86e64ea1191b2c078d98f9a500.tar.gz | |
fixed merge
| -rw-r--r-- | ACE/ace/config-g++-common.h | 8 |
1 files changed, 7 insertions, 1 deletions
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 |