Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(32)

Unified Diff: third_party/protobuf/patches/0008-uninline_get_empty_string.patch

Issue 1842653006: Update //third_party/protobuf to version 3. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: merge Created 4 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: third_party/protobuf/patches/0008-uninline_get_empty_string.patch
diff --git a/third_party/protobuf/patches/0008-uninline_get_empty_string.patch b/third_party/protobuf/patches/0008-uninline_get_empty_string.patch
new file mode 100644
index 0000000000000000000000000000000000000000..8faf5186251bd8767b42825041f9e1f7a5d35896
--- /dev/null
+++ b/third_party/protobuf/patches/0008-uninline_get_empty_string.patch
@@ -0,0 +1,33 @@
+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
+@@ -60,6 +60,12 @@
+ OnShutdown(&DeleteEmptyString);
+ }
+
++const ::std::string& GetEmptyString() {
++ ::google::protobuf::GoogleOnceInit(&empty_string_once_init_, &InitEmptyString);
++ return GetEmptyStringAlreadyInited();
++}
++
++
+ int StringSpaceUsedExcludingSelf(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
+@@ -84,10 +84,8 @@
+ assert(empty_string_ != NULL);
+ return *empty_string_;
+ }
+-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);
+

Powered by Google App Engine
This is Rietveld 408576698