Skip to content

P
protobuf
Unverified Commit 9ab859f5 authored by Ludger Sprenker's avatar Ludger Sprenker Committed by GitHub
Browse files
Options

Create std::string in Arena memory

parent 80e016e8
Show whitespace changes
Inline Side-by-side
Showing with 2 additions and 4 deletions
src/google/protobuf/arenastring.h
View file @ 9ab859f5
...@@ -322,10 +322,8 @@ struct LIBPROTOBUF_EXPORT ArenaStringPtr { ...@@ -322,10 +322,8 @@ struct LIBPROTOBUF_EXPORT ArenaStringPtr {
void CreateInstance(::google::protobuf::Arena* arena, void CreateInstance(::google::protobuf::Arena* arena,
const ::std::string* initial_value) { const ::std::string* initial_value) {
GOOGLE_DCHECK(initial_value != NULL); GOOGLE_DCHECK(initial_value != NULL);
ptr_ = new ::std::string(*initial_value); // uses "new ::std::string" when arena is nullptr
if (arena != NULL) { ptr_ = Arena::Create<::std::string>(arena, *initial_value);
arena->Own(ptr_);
}
} }
GOOGLE_PROTOBUF_ATTRIBUTE_NOINLINE GOOGLE_PROTOBUF_ATTRIBUTE_NOINLINE
void CreateInstanceNoArena(const ::std::string* initial_value) { void CreateInstanceNoArena(const ::std::string* initial_value) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment