Merge pull request #4239 from mrpi/master

Create std::string in Arena memory
7 years ago · 6456e5d646
parent cf016a42e6 14e8852fe4
commit 6456e5d646
1 changed files with 2 additions and 4 deletions
--- a/src/google/protobuf/arenastring.h
+++ b/src/google/protobuf/arenastring.h
@ -322,10 +322,8 @@ struct LIBPROTOBUF_EXPORT ArenaStringPtr {
  void CreateInstance(::google::protobuf::Arena* arena,
                      const ::std::string* initial_value) {
    GOOGLE_DCHECK(initial_value != NULL);
-    ptr_ = new ::std::string(*initial_value);
-    if (arena != NULL) {
-      arena->Own(ptr_);
-    }
+    // uses "new ::std::string" when arena is nullptr
+    ptr_ = Arena::Create< ::std::string >(arena, *initial_value);
  }
  GOOGLE_PROTOBUF_ATTRIBUTE_NOINLINE
  void CreateInstanceNoArena(const ::std::string* initial_value) {