diff options
| author |  Adam Cozzette <acozzette@google.com> | 2016-11-17 16:48:38 -0800 |
|---|---|---|
| committer | Adam Cozzette <acozzette@google.com> | 2016-11-17 16:59:59 -0800 |
| commit | 5a76e633ea9b5adb215e93fdc11e1c0c08b3fc74 (patch) | |
| tree | 0276f81f8848a05d84cd7e287b43d665e30f04e3 /src/google/protobuf/arenastring.cc | |
| parent | e28286fa05d8327fd6c5aa70cfb3be558f0932b8 (diff) | |
Integrated internal changes from Google
Diffstat (limited to 'src/google/protobuf/arenastring.cc')
| -rw-r--r-- | src/google/protobuf/arenastring.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/google/protobuf/arenastring.cc b/src/google/protobuf/arenastring.cc index cce61d74..f10732c0 100644 --- a/src/google/protobuf/arenastring.cc +++ b/src/google/protobuf/arenastring.cc @@ -44,7 +44,7 @@ void ArenaStringPtr::AssignWithDefault(const ::std::string* default_value, const ::std::string* other = *value.UnsafeRawStringPointer(); // If the pointers are the same then do nothing. if (me != other) { - SetNoArena(default_value, value.GetNoArena(default_value)); + SetNoArena(default_value, value.GetNoArena()); } } |