| diff --git a/src/google/protobuf/map_entry_lite.h b/src/google/protobuf/map_entry_lite.h |
| index 1646ce4385..dc6ec9177e 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 30bd7b1d71..27849298ea 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 |
