Merge pull request #4239 from mrpi/master

Create std::string in Arena memory

Merge pull request #4239 from mrpi/master
Create std::string in Arena memory
6456e5d6 · Adam Cozzette · GitHub · cf016a42 · 14e8852f · 6456e5d6
Unverified Commit 6456e5d6 authored Jan 31, 2018 by Adam Cozzette Committed by GitHub Jan 31, 2018
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 4 deletions

arenastring.h src/google/protobuf/arenastring.h +2 -4

No files found.
--- 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) {