Remove spurious NULL checks in ArenaStringPtr::CreateInstance.

pull/2505/head
Chris Kennelly 8 years ago
parent a95e38ce8d
commit ba63fa731e
  1. 15
      src/google/protobuf/arenastring.h

@ -283,22 +283,15 @@ struct LIBPROTOBUF_EXPORT ArenaStringPtr {
GOOGLE_ATTRIBUTE_NOINLINE void CreateInstance(::google::protobuf::Arena* arena, GOOGLE_ATTRIBUTE_NOINLINE void CreateInstance(::google::protobuf::Arena* arena,
const ::std::string* initial_value) { const ::std::string* initial_value) {
// Assumes ptr_ is not NULL. GOOGLE_DCHECK(initial_value != NULL);
if (initial_value != NULL) { ptr_ = new ::std::string(*initial_value);
ptr_ = new ::std::string(*initial_value);
} else {
ptr_ = new ::std::string();
}
if (arena != NULL) { if (arena != NULL) {
arena->Own(ptr_); arena->Own(ptr_);
} }
} }
GOOGLE_ATTRIBUTE_NOINLINE void CreateInstanceNoArena(const ::std::string* initial_value) { GOOGLE_ATTRIBUTE_NOINLINE void CreateInstanceNoArena(const ::std::string* initial_value) {
if (initial_value != NULL) { GOOGLE_DCHECK(initial_value != NULL);
ptr_ = new ::std::string(*initial_value); ptr_ = new ::std::string(*initial_value);
} else {
ptr_ = new ::std::string();
}
} }
}; };

Loading…
Cancel
Save