diff options
author | Adam Cozzette <acozzette@gmail.com> | 2016-12-19 16:18:45 -0800 |
---|---|---|
committer | GitHub <noreply@github.com> | 2016-12-19 16:18:45 -0800 |
commit | bb2c6b21a021e40fcb416572f1cd30b2774c771e (patch) | |
tree | 27fe8670a3fe56b51206a545a6a542b3a7b37c9c | |
parent | fb15862baccbde38a3924f89922a86df2c9a20e0 (diff) | |
parent | ba63fa731ec46f776a9bbfd06b94c4c31e8e0e90 (diff) | |
download | protobuf-bb2c6b21a021e40fcb416572f1cd30b2774c771e.tar.gz protobuf-bb2c6b21a021e40fcb416572f1cd30b2774c771e.tar.bz2 protobuf-bb2c6b21a021e40fcb416572f1cd30b2774c771e.zip |
Merge pull request #2505 from ckennelly/master
Remove spurious NULL checks in ArenaStringPtr::CreateInstance.
-rwxr-xr-x | src/google/protobuf/arenastring.h | 15 |
1 files changed, 4 insertions, 11 deletions
diff --git a/src/google/protobuf/arenastring.h b/src/google/protobuf/arenastring.h index b60ee379..726c19d4 100755 --- a/src/google/protobuf/arenastring.h +++ b/src/google/protobuf/arenastring.h @@ -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); } }; |