Merge pull request #2274 from jwillemsen/jwi-ACE_FALLTHROUGH

Cleanup ACE_FALLTHROUGH
DOCGroup · Aug 5, 2024 · 2f43395 · 2f43395
2 parents 21085b6 + 452d141
commit 2f43395
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 16 deletions.
diff --git a/ACE/ace/config-g++-common.h b/ACE/ace/config-g++-common.h
@@ -22,20 +22,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
@@ -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 */
 
 // ============================================================================