Merge pull request #3754 from toanju/gcc-fallthrough

fix implicit fallthrough in gcc 7

Merge pull request #3754 from toanju/gcc-fallthrough
fix implicit fallthrough in gcc 7
2a142140 · Jisi Liu · GitHub · 07b9238a · 37e112f4 · 2a142140
Commit 2a142140 authored Oct 19, 2017 by Jisi Liu Committed by GitHub Oct 19, 2017
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 0 deletions

port.h src/google/protobuf/stubs/port.h +2 -0

No files found.
--- 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