Skip to content

Changed FDL to use compatible __typeof__() operator. #1982

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

Merged
merged 1 commit into from
Oct 22, 2018
Merged

Changed FDL to use compatible __typeof__() operator. #1982

Show file tree
Hide file tree
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
4 changes: 2 additions & 2 deletions Firebase/DynamicLinks/FIRDLDefaultRetrievalProcessV2.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,11 +123,11 @@ - (void)retrievePendingDynamicLinkInternal {
}
NSURL *uniqueMatchLinkToCheck = [self uniqueMatchLinkToCheck];

__weak typeof(self) weakSelf = self;
__weak __typeof__(self) weakSelf = self;
FIRPostInstallAttributionCompletionHandler completionHandler =
^(NSDictionary *_Nullable dynamicLinkParameters, NSString *_Nullable matchMessage,
NSError *_Nullable error) {
typeof(self) strongSelf = weakSelf;
__typeof__(self) strongSelf = weakSelf;
if (!strongSelf) {
return;
}
Expand Down
4 changes: 2 additions & 2 deletions Firebase/DynamicLinks/FIRDynamicLinks.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -422,10 +422,10 @@ - (nullable FIRDynamicLink *)dynamicLinkFromUniversalLinkURL:(NSURL *)url {
- (BOOL)handleUniversalLink:(NSURL *)universalLinkURL
completion:(FIRDynamicLinkUniversalLinkHandler)completion {
if ([self matchesShortLinkFormat:universalLinkURL]) {
__weak typeof(self) weakSelf = self;
__weak __typeof__(self) weakSelf = self;
[self resolveShortLink:universalLinkURL
completion:^(NSURL *url, NSError *error) {
typeof(self) strongSelf = weakSelf;
__typeof__(self) strongSelf = weakSelf;
if (strongSelf) {
FIRDynamicLink *dynamicLink = [strongSelf dynamicLinkFromCustomSchemeURL:url];
dispatch_async(dispatch_get_main_queue(), ^{
Expand Down