Skip to content

Commit 142791b

Browse files
authored
Merge pull request #31039 from hamishknight/pointer-to-pointer-conversions
Adjust NullablePtr constructor template condition
2 parents ed28d8b + 05d7310 commit 142791b

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

include/swift/Basic/NullablePtr.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ class NullablePtr {
3737
template<typename OtherT>
3838
NullablePtr(NullablePtr<OtherT> Other,
3939
typename std::enable_if<
40-
std::is_convertible<OtherT, T>::value,
40+
std::is_convertible<OtherT *, T *>::value,
4141
PlaceHolder
4242
>::type = PlaceHolder()) : Ptr(Other.getPtrOrNull()) {}
4343

0 commit comments

Comments
 (0)