Skip to content

Commit a942f72

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 64cae13 commit a942f72

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
@@ -217,20 +217,22 @@ BaseObject::PointerData*
217217
BaseObjectPtrImpl<T, kIsWeak>::pointer_data() const {
218218
if (kIsWeak) {
219219
return data_.pointer_data;
220-
} else {
221-
if (get_base_object() == nullptr) return nullptr;
222-
return get_base_object()->pointer_data();
223220
}
221+
if (get_base_object() == nullptr) {
222+
return nullptr;
223+
}
224+
return get_base_object()->pointer_data();
224225
}
225226

226227
template <typename T, bool kIsWeak>
227228
BaseObject* BaseObjectPtrImpl<T, kIsWeak>::get_base_object() const {
228229
if (kIsWeak) {
229-
if (pointer_data() == nullptr) return nullptr;
230+
if (pointer_data() == nullptr) {
231+
return nullptr;
232+
}
230233
return pointer_data()->self;
231-
} else {
232-
return data_.target;
233234
}
235+
return data_.target;
234236
}
235237

236238
template <typename T, bool kIsWeak>

0 commit comments

Comments
 (0)