From 69feafc05fd83f1d4b48c4093698e5110ccd03e9 Mon Sep 17 00:00:00 2001
From: Johnny Willemsen <jwillemsen@remedy.nl>
Date: Mon, 29 Aug 2022 15:24:44 +0200
Subject: 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
---
 ACE/ace/config-g++-common.h | 14 +++++++-------
 1 file 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)
-- 
cgit v1.2.1