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}
34 lines
1.2 KiB
Diff
34 lines
1.2 KiB
Diff
unchanged:
|
|
--- protobuf-cleaned/src/google/protobuf/generated_message_util.cc 2015-12-30 13:21:46.000000000 -0800
|
|
+++ protobuf-patched/src/google/protobuf/generated_message_util.cc 2016-03-31 13:25:32.180017848 -0700
|
|
@@ -58,6 +58,12 @@
|
|
OnShutdown(&DeleteEmptyString);
|
|
}
|
|
|
|
+const ::std::string& GetEmptyString() {
|
|
+ ::google::protobuf::GoogleOnceInit(&empty_string_once_init_, &InitEmptyString);
|
|
+ return GetEmptyStringAlreadyInited();
|
|
+}
|
|
+
|
|
+
|
|
size_t StringSpaceUsedExcludingSelfLong(const string& str) {
|
|
const void* start = &str;
|
|
const void* end = &str + 1;
|
|
only in patch2:
|
|
unchanged:
|
|
--- protobuf-cleaned/src/google/protobuf/generated_message_util.h 2015-12-30 13:21:46.000000000 -0800
|
|
+++ protobuf-patched/src/google/protobuf/generated_message_util.h 2016-03-31 13:25:40.252007316 -0700
|
|
@@ -120,10 +120,8 @@
|
|
return fixed_address_empty_string.get();
|
|
}
|
|
|
|
-LIBPROTOBUF_EXPORT inline const ::std::string& GetEmptyString() {
|
|
- ::google::protobuf::GoogleOnceInit(&empty_string_once_init_, &InitEmptyString);
|
|
- return GetEmptyStringAlreadyInited();
|
|
-}
|
|
+
|
|
+LIBPROTOBUF_EXPORT const ::std::string& GetEmptyString();
|
|
|
|
LIBPROTOBUF_EXPORT int StringSpaceUsedExcludingSelf(const string& str);
|
|
|