Skip to content

src: remove unnecessary else in base_object-inl.h #33413

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

Closed
danbev wants to merge 1 commit into from
Closed

src: remove unnecessary else in base_object-inl.h #33413

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
src: remove unnecessary else in base_object-inl.h 
This commit removes two unnecessary else statements in
base_object-inl.h. It also tries to make the if statements consistent
with regards to braces.
  • Loading branch information
@danbev
danbev committed May 15, 2020
commit 58523110d37c8cb2fda823df356e1a784431279e
14 changes: 8 additions & 6 deletions src/base_object-inl.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -217,20 +217,22 @@ BaseObject::PointerData*
BaseObjectPtrImpl<T, kIsWeak>::pointer_data() const {
if (kIsWeak) {
return data_.pointer_data;
} else {
if (get_base_object() == nullptr) return nullptr;
return get_base_object()->pointer_data();
}
if (get_base_object() == nullptr) {
return nullptr;
}
return get_base_object()->pointer_data();
}

template <typename T, bool kIsWeak>
BaseObject* BaseObjectPtrImpl<T, kIsWeak>::get_base_object() const {
if (kIsWeak) {
if (pointer_data() == nullptr) return nullptr;
if (pointer_data() == nullptr) {
return nullptr;
}
return pointer_data()->self;
} else {
return data_.target;
}
return data_.target;
}

template <typename T, bool kIsWeak>
Expand Down