AuroraMiddleware/protobuf
1
0
Fork 0
Code Issues 1 Pull Requests Projects Releases Wiki Activity

Merge pull request #4288 from nico/nofall

Browse Source 
Remove use of GOOGLE_FALLTHROUGH_INTENDED from protobuf.
This commit is contained in:
Feng Xiao 2018-02-08 10:53:41 -08:00 committed by GitHub
commit b8e47830d4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 1 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/google/protobuf/map_entry_lite.h
View File

@ -201,8 +201,7 @@ class MapEntryImpl : public Base {
return false; return false;
} }
set_has_key(); set_has_key();
if (!input->ExpectTag(kValueTag)) break; break;
GOOGLE_FALLTHROUGH_INTENDED;
case kValueTag: case kValueTag:
if (!ValueTypeHandler::Read(input, mutable_value())) { if (!ValueTypeHandler::Read(input, mutable_value())) {

14
src/google/protobuf/stubs/port.h
View File

@ -237,20 +237,6 @@ static const uint64 kuint64max = GOOGLE_ULONGLONG(0xFFFFFFFFFFFFFFFF);
#define GOOGLE_SAFE_CONCURRENT_WRITES_END() #define GOOGLE_SAFE_CONCURRENT_WRITES_END()
#endif #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_GUARDED_BY(x)
#define GOOGLE_ATTRIBUTE_COLD #define GOOGLE_ATTRIBUTE_COLD