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

Side by Side Diff: third_party/protobuf/patches/0008-uninline_get_empty_string.patch

Issue 2495533002: third_party/protobuf: Update to HEAD (83d681ee2c) (Closed)
Patch Set: Make chrome settings proto generated file a component Created 4 years 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 unified diff | Download patch
OLDNEW
1 unchanged: 1 unchanged:
2 --- protobuf-cleaned/src/google/protobuf/generated_message_util.cc 2015-12- 30 13:21:46.000000000 -0800 2 --- protobuf-cleaned/src/google/protobuf/generated_message_util.cc 2015-12- 30 13:21:46.000000000 -0800
3 +++ protobuf-patched/src/google/protobuf/generated_message_util.cc 2016-03- 31 13:25:32.180017848 -0700 3 +++ protobuf-patched/src/google/protobuf/generated_message_util.cc 2016-03- 31 13:25:32.180017848 -0700
4 @@ -60,6 +60,12 @@ 4 @@ -60,6 +60,12 @@
5 OnShutdown(&DeleteEmptyString); 5 OnShutdown(&DeleteEmptyString);
6 } 6 }
7 7
8 +const ::std::string& GetEmptyString() { 8 +const ::std::string& GetEmptyString() {
9 + ::google::protobuf::GoogleOnceInit(&empty_string_once_init_, &InitEmptyString ); 9 + ::google::protobuf::GoogleOnceInit(&empty_string_once_init_, &InitEmptyString );
10 + return GetEmptyStringAlreadyInited(); 10 + return GetEmptyStringAlreadyInited();
11 +} 11 +}
12 + 12 +
13 + 13 +
14 int StringSpaceUsedExcludingSelf(const string& str) { 14 int StringSpaceUsedExcludingSelf(const string& str) {
15 const void* start = &str; 15 const void* start = &str;
16 const void* end = &str + 1; 16 const void* end = &str + 1;
17 only in patch2: 17 only in patch2:
18 unchanged: 18 unchanged:
19 --- protobuf-cleaned/src/google/protobuf/generated_message_util.h 2015-12- 30 13:21:46.000000000 -0800 19 --- protobuf-cleaned/src/google/protobuf/generated_message_util.h 2015-12- 30 13:21:46.000000000 -0800
20 +++ protobuf-patched/src/google/protobuf/generated_message_util.h 2016-03- 31 13:25:40.252007316 -0700 20 +++ protobuf-patched/src/google/protobuf/generated_message_util.h 2016-03- 31 13:25:40.252007316 -0700
21 @@ -84,10 +84,8 @@ 21 @@ -120,10 +120,8 @@
22 assert(empty_string_ != NULL); 22 return fixed_address_empty_string.get();
23 return *empty_string_;
24 } 23 }
24
25 -LIBPROTOBUF_EXPORT inline const ::std::string& GetEmptyString() { 25 -LIBPROTOBUF_EXPORT inline const ::std::string& GetEmptyString() {
26 - ::google::protobuf::GoogleOnceInit(&empty_string_once_init_, &InitEmptyString ); 26 - ::google::protobuf::GoogleOnceInit(&empty_string_once_init_, &InitEmptyString );
27 - return GetEmptyStringAlreadyInited(); 27 - return GetEmptyStringAlreadyInited();
28 -} 28 -}
29 + 29 +
30 +LIBPROTOBUF_EXPORT const ::std::string& GetEmptyString(); 30 +LIBPROTOBUF_EXPORT const ::std::string& GetEmptyString();
31 31
32 LIBPROTOBUF_EXPORT int StringSpaceUsedExcludingSelf(const string& str); 32 LIBPROTOBUF_EXPORT int StringSpaceUsedExcludingSelf(const string& str);
33 33
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698