diff options
| author |  Feng Xiao <xfxyjwf@gmail.com> | 2018-02-08 10:53:41 -0800 |
|---|---|---|
| committer |  GitHub <noreply@github.com> | 2018-02-08 10:53:41 -0800 |
| commit | b8e47830d4679da5fa51fbb4b1f9cbf707b08900 (patch) | |
| tree | e0b327765cf33f1f42d1fda4b91cc35f48806c47 /src/google/protobuf | |
| parent | 07f023188e929019f506e9b390dde70539ea857f (diff) | |
| parent | c66dd6c2760f0edeaa2529f25668f025a9f5dd0c (diff) | |
Merge pull request #4288 from nico/nofall
Remove use of GOOGLE_FALLTHROUGH_INTENDED from protobuf.
Diffstat (limited to 'src/google/protobuf')
| -rw-r--r-- | src/google/protobuf/map_entry_lite.h | 3 | ||||
| -rw-r--r-- | src/google/protobuf/stubs/port.h | 14 |
2 files changed, 1 insertions, 16 deletions
diff --git a/src/google/protobuf/map_entry_lite.h b/src/google/protobuf/map_entry_lite.h index 1646ce43..dc6ec917 100644 --- a/src/google/protobuf/map_entry_lite.h +++ b/src/google/protobuf/map_entry_lite.h @@ -201,8 +201,7 @@ class MapEntryImpl : public Base { return false; } set_has_key(); - if (!input->ExpectTag(kValueTag)) break; - GOOGLE_FALLTHROUGH_INTENDED; + break; case kValueTag: if (!ValueTypeHandler::Read(input, mutable_value())) { diff --git a/src/google/protobuf/stubs/port.h b/src/google/protobuf/stubs/port.h index 30bd7b1d..27849298 100644 --- a/src/google/protobuf/stubs/port.h +++ b/src/google/protobuf/stubs/port.h @@ -237,20 +237,6 @@ static const uint64 kuint64max = GOOGLE_ULONGLONG(0xFFFFFFFFFFFFFFFF); #define GOOGLE_SAFE_CONCURRENT_WRITES_END() #endif -#if defined(__clang__) && defined(__has_cpp_attribute) \ - && !defined(GOOGLE_PROTOBUF_OS_APPLE) -# if defined(GOOGLE_PROTOBUF_OS_NACL) || defined(EMSCRIPTEN) || \ - __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 -# define GOOGLE_FALLTHROUGH_INTENDED -#endif - #define GOOGLE_GUARDED_BY(x) #define GOOGLE_ATTRIBUTE_COLD |