diff options
| author | Johnny Willemsen <jwillemsen@remedy.nl> | 2022-09-05 14:34:13 +0200 |
|---|---|---|
| committer | Adam Mitz <mitza@objectcomputing.com> | 2022-10-03 13:11:34 -0500 |
| commit | 8b83b5df37a2bb8c95aa687d0ca799a345fa306e (patch) | |
| tree | c2ccde1ddf15a274991097259d0abf6deff03c64 | |
| parent | 69feafc05fd83f1d4b48c4093698e5110ccd03e9 (diff) | |
| download | ATCD-8b83b5df37a2bb8c95aa687d0ca799a345fa306e.tar.gz | |
Merge pull request #1917 from jwillemsen/jwi-redefinedfallthrough
Fixed redefined ACE_FALLTHROUGH warnings
(cherry picked from commit c8d4a23b971afe8de1128978a7e8e5d25269762b)
| -rw-r--r-- | ACE/ace/config-g++-common.h | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/ACE/ace/config-g++-common.h b/ACE/ace/config-g++-common.h index c524a20e513..bf94f816d79 100644 --- a/ACE/ace/config-g++-common.h +++ b/ACE/ace/config-g++-common.h @@ -37,10 +37,12 @@ #endif #if __cplusplus >= 201103L # define ACE_HAS_CPP11 -# if !defined (ACE_FALLTHROUGH) && (__GNUC__ >= 7) -# define ACE_FALLTHROUGH [[gnu::fallthrough]] -# else -# define ACE_FALLTHROUGH +# if !defined (ACE_FALLTHROUGH) +# if __GNUC__ >= 7 +# define ACE_FALLTHROUGH [[gnu::fallthrough]] +# else +# define ACE_FALLTHROUGH +# endif # endif #endif |