From fe2f99f33b65193de4f3e1bbeb2953aa355a2ead Mon Sep 17 00:00:00 2001 From: zoecarver Date: Sat, 10 Oct 2020 15:45:48 -0700 Subject: [PATCH] [cxx-interop] Cast data to the correct type. The implicit conversions are OK in C but C++ will error. To make this header valid in both C and C++ we should just always cast. --- stdlib/public/SwiftShims/DispatchOverlayShims.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/stdlib/public/SwiftShims/DispatchOverlayShims.h b/stdlib/public/SwiftShims/DispatchOverlayShims.h index e9eeebfeb75f6..d49e9ad38263c 100644 --- a/stdlib/public/SwiftShims/DispatchOverlayShims.h +++ b/stdlib/public/SwiftShims/DispatchOverlayShims.h @@ -215,8 +215,8 @@ static inline unsigned int _swift_dispatch_data_apply( __swift_shims_dispatch_data_t data, __swift_shims_dispatch_data_applier SWIFT_DISPATCH_NOESCAPE applier) { - return dispatch_data_apply(data, ^bool(dispatch_data_t data, size_t off, const void *loc, size_t size){ - return applier(data, off, loc, size); + return dispatch_data_apply((dispatch_data_t)data, ^bool(dispatch_data_t data, size_t off, const void *loc, size_t size){ + return applier((__swift_shims_dispatch_data_t)data, off, loc, size); }); }