diff options
| author |  Jisi Liu <jisi.liu@gmail.com> | 2016-03-30 11:39:59 -0700 |
|---|---|---|
| committer | Jisi Liu <jisi.liu@gmail.com> | 2016-03-30 11:39:59 -0700 |
| commit | 3b3c8abb9635eb3ea078a821a99c9ef29d66dff7 (patch) | |
| tree | 7d2ec154f15c9f9153d890e76b6cf30e471ea488 /src/google/protobuf/arenastring.h | |
| parent | 78105897a8f01c7be9cf8502b6c58d47eb1ccdd7 (diff) | |
Integrate google internal changes.
Diffstat (limited to 'src/google/protobuf/arenastring.h')
| -rwxr-xr-x | src/google/protobuf/arenastring.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/google/protobuf/arenastring.h b/src/google/protobuf/arenastring.h index e2e2f254..590ffce9 100755 --- a/src/google/protobuf/arenastring.h +++ b/src/google/protobuf/arenastring.h @@ -134,7 +134,8 @@ struct LIBPROTOBUF_EXPORT ArenaStringPtr { // UnsafeArenaRelease() on another field of a message in the same arena. Used // to implement unsafe_arena_set_allocated_<field> in generated classes. inline void UnsafeArenaSetAllocated(const ::std::string* default_value, - ::std::string* value, ::google::protobuf::Arena* /* arena */) { + ::std::string* value, + ::google::protobuf::Arena* /* arena */) { if (value != NULL) { ptr_ = value; } else { |