From 452d14159cba5389d55c2e6948d35354f9da8a5d Mon Sep 17 00:00:00 2001
From: Johnny Willemsen <jwillemsen@remedy.nl>
Date: Mon, 5 Aug 2024 19:36:08 +0200
Subject: [PATCH] Cleanup ACE_FALLTHROUGH

    * ACE/ace/config-g++-common.h:
    * ACE/ace/config-macros.h:
---
 ACE/ace/config-g++-common.h | 8 --------
 ACE/ace/config-macros.h     | 9 +--------
 2 files changed, 1 insertion(+), 16 deletions(-)

diff --git a/ACE/ace/config-g++-common.h b/ACE/ace/config-g++-common.h
index d97f8085e55b3..95fc0ac65a4bb 100644
--- a/ACE/ace/config-g++-common.h
+++ b/ACE/ace/config-g++-common.h
@@ -19,20 +19,12 @@
 #endif
 #if __cplusplus >= 201703L
 # define ACE_HAS_CPP17
-# define ACE_FALLTHROUGH [[fallthrough]]
 #endif
 #if __cplusplus >= 201402L
 # define ACE_HAS_CPP14
 #endif
 #if __cplusplus >= 201103L
 # define ACE_HAS_CPP11
-# if !defined (ACE_FALLTHROUGH)
-#  if __GNUC__ >= 7
-#   define ACE_FALLTHROUGH [[gnu::fallthrough]]
-#  else
-#   define ACE_FALLTHROUGH
-#  endif
-# endif
 #endif
 
 #if (defined (i386) || defined (__i386__)) && !defined (ACE_SIZEOF_LONG_DOUBLE)
diff --git a/ACE/ace/config-macros.h b/ACE/ace/config-macros.h
index 83dda72661bc3..a661c3d2aa23f 100644
--- a/ACE/ace/config-macros.h
+++ b/ACE/ace/config-macros.h
@@ -260,15 +260,8 @@
 # define ACE_NOTREACHED(a) a
 #endif /* ghs || ..... */
 
-
-// Compiler-specific configs can define ACE_FALLTHROUGH but if not,
-// and it's a C++17 or higher compiler, use the defined mechanism.
 #if !defined ACE_FALLTHROUGH
-#  if defined ACE_HAS_CPP17
-#    define ACE_FALLTHROUGH [[fallthrough]]
-#  else
-#    define ACE_FALLTHROUGH
-#  endif /* ACE_HAS_CPP17 */
+#  define ACE_FALLTHROUGH [[fallthrough]]
 #endif /* ACE_FALLTHROUGH */
 
 // ============================================================================