aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorGravatar Paul Beusterien <paulbeusterien@google.com>2017-10-09 12:22:11 -0700
committerGravatar GitHub <noreply@github.com>2017-10-09 12:22:11 -0700
commit8156da3f32e3b41e4a1222d05261be47be67b0d6 (patch)
tree2eae9e301d5f5d89fd42462d3df0d59ea65e78bc
parent20b94f750fc73317fb788f3bbfdd5b712587edc4 (diff)
Fix warnings exposed by Xcode 9.1 in Auth (#350)
-rw-r--r--Firebase/Auth/Source/FIRAuth.m2
-rw-r--r--Firebase/Auth/Source/FIRAuthGlobalWorkQueue.h2
-rw-r--r--Firebase/Auth/Source/FIRAuthURLPresenter.m2
-rw-r--r--Firebase/Core/FIRAppAssociationRegistration.m2
-rw-r--r--Firebase/Core/Private/FIRAppAssociationRegistration.h2
5 files changed, 5 insertions, 5 deletions
diff --git a/Firebase/Auth/Source/FIRAuth.m b/Firebase/Auth/Source/FIRAuth.m
index 7b36ac6..6c349a1 100644
--- a/Firebase/Auth/Source/FIRAuth.m
+++ b/Firebase/Auth/Source/FIRAuth.m
@@ -892,7 +892,7 @@ static NSMutableDictionary *gKeychainServiceNameForAppName;
});
}
-- (BOOL)signOut:(NSError *_Nullable *_Nullable)error {
+- (BOOL)signOut:(NSError *_Nullable __autoreleasing *_Nullable)error {
__block BOOL result = YES;
dispatch_sync(FIRAuthGlobalWorkQueue(), ^{
if (!_currentUser) {
diff --git a/Firebase/Auth/Source/FIRAuthGlobalWorkQueue.h b/Firebase/Auth/Source/FIRAuthGlobalWorkQueue.h
index 0950ff4..55bb1a7 100644
--- a/Firebase/Auth/Source/FIRAuthGlobalWorkQueue.h
+++ b/Firebase/Auth/Source/FIRAuthGlobalWorkQueue.h
@@ -26,6 +26,6 @@ NS_ASSUME_NONNULL_BEGIN
implementations that may involve contested code shall dispatch to this work queue as the
first thing they do.
*/
-extern dispatch_queue_t FIRAuthGlobalWorkQueue();
+extern dispatch_queue_t FIRAuthGlobalWorkQueue(void);
NS_ASSUME_NONNULL_END
diff --git a/Firebase/Auth/Source/FIRAuthURLPresenter.m b/Firebase/Auth/Source/FIRAuthURLPresenter.m
index 9e24805..919aee1 100644
--- a/Firebase/Auth/Source/FIRAuthURLPresenter.m
+++ b/Firebase/Auth/Source/FIRAuthURLPresenter.m
@@ -157,7 +157,7 @@ NS_ASSUME_NONNULL_BEGIN
_UIDelegate = nil;
FIRAuthURLPresentationCompletion completion = _completion;
_completion = nil;
- void (^finishBlock)() = ^() {
+ void (^finishBlock)(void) = ^() {
_isPresenting = NO;
completion(URL, error);
};
diff --git a/Firebase/Core/FIRAppAssociationRegistration.m b/Firebase/Core/FIRAppAssociationRegistration.m
index a36396d..2aecdab 100644
--- a/Firebase/Core/FIRAppAssociationRegistration.m
+++ b/Firebase/Core/FIRAppAssociationRegistration.m
@@ -20,7 +20,7 @@
+ (nullable id)registeredObjectWithHost:(id)host
key:(NSString *)key
- creationBlock:(id _Nullable (^)())creationBlock {
+ creationBlock:(id _Nullable (^)(void))creationBlock {
@synchronized(self) {
SEL dictKey = @selector(registeredObjectWithHost:key:creationBlock:);
NSMutableDictionary<NSString *, id> *objectsByKey = objc_getAssociatedObject(host, dictKey);
diff --git a/Firebase/Core/Private/FIRAppAssociationRegistration.h b/Firebase/Core/Private/FIRAppAssociationRegistration.h
index 9778988..a1f8c41 100644
--- a/Firebase/Core/Private/FIRAppAssociationRegistration.h
+++ b/Firebase/Core/Private/FIRAppAssociationRegistration.h
@@ -41,7 +41,7 @@ NS_ASSUME_NONNULL_BEGIN
*/
+ (nullable ObjectType)registeredObjectWithHost:(id)host
key:(NSString *)key
- creationBlock:(ObjectType _Nullable (^)())creationBlock;
+ creationBlock:(ObjectType _Nullable (^)(void))creationBlock;
@end