organicmaps/protobuf
13
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity Actions

Merge pull request #652 from TeBoring/objectivec

Browse source 
Move the definition of GOOGLE_FALLTHROUGH_INTENDED to port.h
This commit is contained in:
Paul Yang 2015-07-29 15:20:47 -07:00
commit c6dffbcb4f
2 changed files with 12 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/google/protobuf/map_entry_lite.h
View file

@ -162,19 +162,7 @@ class MapEntryLite : public MessageLite {
if (!KeyWireHandler::Read(input, mutable_key())) return false;
set_has_key();
if (!input->ExpectTag(kValueTag)) break;
// BEGIN GOOGLE LOCAL MODIFICATION
// Add __has_cpp_attribute and NaCl and Emscripten checks.
#if defined(__clang__) && defined(__has_cpp_attribute) \
&& !defined(GOOGLE_PROTOBUF_OS_APPLE)
#if defined(GOOGLE_PROTOBUF_OS_NACL) || defined(EMSCRIPTEN)
[[clang::fallthrough]];
#elif __has_cpp_attribute(clang::fallthrough)
[[clang::fallthrough]];
#endif
#else
GOOGLE_FALLTHROUGH_INTENDED;
#endif
// END GOOGLE LOCAL MODIFICATION
case kValueTag:
if (!ValueWireHandler::Read(input, mutable_value())) return false;

13
src/google/protobuf/stubs/port.h
View file

@ -204,8 +204,19 @@ 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
#endif
#ifndef GOOGLE_FALLTHROUGH_INTENDED
# define GOOGLE_FALLTHROUGH_INTENDED
#endif
#define GOOGLE_GUARDED_BY(x)
#define GOOGLE_FALLTHROUGH_INTENDED
#define GOOGLE_ATTRIBUTE_COLD
// x86 and x86-64 can perform unaligned loads/stores directly.