Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Remove spurious NULL checks in ArenaStringPtr::CreateInstance. #2505

Merged
merged 1 commit into from
Dec 20, 2016
Merged

Remove spurious NULL checks in ArenaStringPtr::CreateInstance. #2505

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Remove spurious NULL checks in ArenaStringPtr::CreateInstance.
  • Loading branch information
@ckennelly
ckennelly committed Dec 15, 2016
commit ba63fa731ec46f776a9bbfd06b94c4c31e8e0e90
15 changes: 4 additions & 11 deletions src/google/protobuf/arenastring.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -283,22 +283,15 @@ struct LIBPROTOBUF_EXPORT ArenaStringPtr {

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

Expand Down