浏览代码

Merge pull request #3754 from toanju/gcc-fallthrough

fix implicit fallthrough in gcc 7
Jisi Liu 8 年之前
父节点
当前提交
2a14214045
共有 1 个文件被更改,包括 2 次插入0 次删除
  1. 2 0
      src/google/protobuf/stubs/port.h

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

@@ -243,6 +243,8 @@ static const uint64 kuint64max = GOOGLE_ULONGLONG(0xFFFFFFFFFFFFFFFF);
      __has_cpp_attribute(clang::fallthrough)
      __has_cpp_attribute(clang::fallthrough)
 #  define GOOGLE_FALLTHROUGH_INTENDED [[clang::fallthrough]]
 #  define GOOGLE_FALLTHROUGH_INTENDED [[clang::fallthrough]]
 # endif
 # endif
+#elif defined(__GNUC__) && __GNUC__ > 6
+# define GOOGLE_FALLTHROUGH_INTENDED [[gnu::fallthrough]]
 #endif
 #endif
 
 
 #ifndef GOOGLE_FALLTHROUGH_INTENDED
 #ifndef GOOGLE_FALLTHROUGH_INTENDED