summaryrefslogtreecommitdiff
path: root/ACE
diff options
context:
space:
mode:
authorJohnny Willemsen <jwillemsen@remedy.nl>2022-08-29 15:24:44 +0200
committerAdam Mitz <mitza@objectcomputing.com>2022-10-03 13:04:26 -0500
commit69feafc05fd83f1d4b48c4093698e5110ccd03e9 (patch)
tree37c91e01e5978ff8802bec248539f06c1996e9fb /ACE
parent9dc8ff7c9081dbdfc69826f59e12f5e8f11ba675 (diff)
downloadATCD-69feafc05fd83f1d4b48c4093698e5110ccd03e9.tar.gz
Merge pull request #1910 from Erich71/old_gcc_fix
Fix ACE_FALLTHROUGH definition for old GCC compilers. (cherry picked from commit 348277c5a753b65b7a0cc206720fd7ea47f81659) # Conflicts: # ACE/ace/config-g++-common.h
Diffstat (limited to 'ACE')
-rw-r--r--ACE/ace/config-g++-common.h14
1 files changed, 7 insertions, 7 deletions
diff --git a/ACE/ace/config-g++-common.h b/ACE/ace/config-g++-common.h
index a4c945249e4..c524a20e513 100644
--- a/ACE/ace/config-g++-common.h
+++ b/ACE/ace/config-g++-common.h
@@ -31,17 +31,17 @@
# define ACE_HAS_NEW_NOTHROW
#endif /* __GNUC__ >= 3.3 */
-#if __cplusplus >= 201103L
-# define ACE_HAS_CPP11
#endif
#if __cplusplus >= 201402L
# define ACE_HAS_CPP14
#endif
-#if __cplusplus >= 201703L
-# define ACE_HAS_CPP17
-#endif
-#if __cplusplus >= 202002L
-# define ACE_HAS_CPP20
+#if __cplusplus >= 201103L
+# define ACE_HAS_CPP11
+# if !defined (ACE_FALLTHROUGH) && (__GNUC__ >= 7)
+# define ACE_FALLTHROUGH [[gnu::fallthrough]]
+# else
+# define ACE_FALLTHROUGH
+# endif
#endif
#if (defined (i386) || defined (__i386__)) && !defined (ACE_SIZEOF_LONG_DOUBLE)