| OLD | NEW |
| (Empty) |
| 1 unchanged: | |
| 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 | |
| 4 @@ -60,6 +60,12 @@ | |
| 5 OnShutdown(&DeleteEmptyString); | |
| 6 } | |
| 7 | |
| 8 +const ::std::string& GetEmptyString() { | |
| 9 + ::google::protobuf::GoogleOnceInit(&empty_string_once_init_, &InitEmptyString
); | |
| 10 + return GetEmptyStringAlreadyInited(); | |
| 11 +} | |
| 12 + | |
| 13 + | |
| 14 int StringSpaceUsedExcludingSelf(const string& str) { | |
| 15 const void* start = &str; | |
| 16 const void* end = &str + 1; | |
| 17 only in patch2: | |
| 18 unchanged: | |
| 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 | |
| 21 @@ -84,10 +84,8 @@ | |
| 22 assert(empty_string_ != NULL); | |
| 23 return *empty_string_; | |
| 24 } | |
| 25 -LIBPROTOBUF_EXPORT inline const ::std::string& GetEmptyString() { | |
| 26 - ::google::protobuf::GoogleOnceInit(&empty_string_once_init_, &InitEmptyString
); | |
| 27 - return GetEmptyStringAlreadyInited(); | |
| 28 -} | |
| 29 + | |
| 30 +LIBPROTOBUF_EXPORT const ::std::string& GetEmptyString(); | |
| 31 | |
| 32 LIBPROTOBUF_EXPORT int StringSpaceUsedExcludingSelf(const string& str); | |
| 33 | |
| OLD | NEW |