739351d476
Change log:95336cb92b..191d55580eFull diff:95336cb92b..191d55580eRoll chromium third_party 4e16929f46..3a8f2a9e1e Change log:4e16929f46..3a8f2a9e1eChanged dependencies: * src/tools:c44a3f5eca..f524a53b81DEPS diff:95336cb92b..191d55580e/DEPS No update to Clang. TBR=titovartem@google.com, BUG=None CQ_INCLUDE_TRYBOTS=master.internal.tryserver.corp.webrtc:linux_internal Change-Id: Ic9c4a62b050383646e9fcf5cc07a5653c14ac06e Reviewed-on: https://webrtc-review.googlesource.com/76120 Reviewed-by: Patrik Höglund <phoglund@webrtc.org> Reviewed-by: Karl Wiberg <kwiberg@webrtc.org> Reviewed-by: Artem Titov <titovartem@webrtc.org> Commit-Queue: Artem Titov <titovartem@webrtc.org> Cr-Commit-Position: refs/heads/master@{#23205}
39 lines
1.4 KiB
Diff
39 lines
1.4 KiB
Diff
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
|