Merge pull request #3754 from toanju/gcc-fallthrough

fix implicit fallthrough in gcc 7
7 years ago · 2a14214045
parent 07b9238a1c 37e112f456
commit 2a14214045
1 changed files with 2 additions and 0 deletions
--- a/src/google/protobuf/stubs/port.h
+++ b/src/google/protobuf/stubs/port.h
@ -243,6 +243,8 @@ static const uint64 kuint64max = GOOGLE_ULONGLONG(0xFFFFFFFFFFFFFFFF);
     __has_cpp_attribute(clang::fallthrough)
 #  define GOOGLE_FALLTHROUGH_INTENDED [[clang::fallthrough]]
 # endif
+#elif defined(__GNUC__) && __GNUC__ > 6
+# define GOOGLE_FALLTHROUGH_INTENDED [[gnu::fallthrough]]
 #endif

 #ifndef GOOGLE_FALLTHROUGH_INTENDED