diff options
| author |  Feng Xiao <xfxyjwf@gmail.com> | 2017-03-29 14:32:48 -0700 |
|---|---|---|
| committer | Feng Xiao <xfxyjwf@gmail.com> | 2017-03-29 14:33:05 -0700 |
| commit | d36c0c538a545fac5d9db6ba65c525246d4efa95 (patch) | |
| tree | 3fd29af0f137dfaf5df892723e60600f674392b3 /src/google/protobuf/generated_message_util.cc | |
| parent | 4a0dd03e52e09332c8fd0f8f26a8e0ae9f911182 (diff) | |
Down-integrate from google3.
Diffstat (limited to 'src/google/protobuf/generated_message_util.cc')
| -rw-r--r-- | src/google/protobuf/generated_message_util.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/google/protobuf/generated_message_util.cc b/src/google/protobuf/generated_message_util.cc index b4d2c9c1..35d8156e 100644 --- a/src/google/protobuf/generated_message_util.cc +++ b/src/google/protobuf/generated_message_util.cc @@ -58,7 +58,7 @@ void InitEmptyString() { OnShutdown(&DeleteEmptyString); } -int StringSpaceUsedExcludingSelf(const string& str) { +size_t StringSpaceUsedExcludingSelfLong(const string& str) { const void* start = &str; const void* end = &str + 1; if (start <= str.data() && str.data() < end) { |