| 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
|
| index 8faf5186251bd8767b42825041f9e1f7a5d35896..727d6f3c0f3aa357847855539a2cc20eb2a96b39 100644
|
| --- a/third_party/protobuf/patches/0008-uninline_get_empty_string.patch
|
| +++ b/third_party/protobuf/patches/0008-uninline_get_empty_string.patch
|
| @@ -18,10 +18,10 @@ 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_;
|
| +@@ -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();
|
|
|