Skip to content

Commit c697b96

Browse files
danbevcodebytere
authored andcommitted
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. PR-URL: #33413 Reviewed-By: Zeyu Yang <[email protected]> Reviewed-By: Richard Lau <[email protected]> Reviewed-By: Luigi Pinca <[email protected]> Reviewed-By: James M Snell <[email protected]> Reviewed-By: Colin Ihrig <[email protected]> Reviewed-By: Juan José Arboleda <[email protected]>
1 parent c502384 commit c697b96

File tree

1 file changed

+8
-6
lines changed

1 file changed

+8
-6
lines changed

src/base_object-inl.h

+8-6
Original file line numberDiff line numberDiff line change
@@ -216,20 +216,22 @@ BaseObject::PointerData*
216216
BaseObjectPtrImpl<T, kIsWeak>::pointer_data() const {
217217
if (kIsWeak) {
218218
return data_.pointer_data;
219-
} else {
220-
if (get_base_object() == nullptr) return nullptr;
221-
return get_base_object()->pointer_data();
222219
}
220+
if (get_base_object() == nullptr) {
221+
return nullptr;
222+
}
223+
return get_base_object()->pointer_data();
223224
}
224225

225226
template <typename T, bool kIsWeak>
226227
BaseObject* BaseObjectPtrImpl<T, kIsWeak>::get_base_object() const {
227228
if (kIsWeak) {
228-
if (pointer_data() == nullptr) return nullptr;
229+
if (pointer_data() == nullptr) {
230+
return nullptr;
231+
}
229232
return pointer_data()->self;
230-
} else {
231-
return data_.target;
232233
}
234+
return data_.target;
233235
}
234236

235237
template <typename T, bool kIsWeak>

0 commit comments

Comments
 (0)