diff options
author | Paul Beusterien <paulbeusterien@google.com> | 2017-10-09 14:18:11 -0700 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-10-09 14:18:11 -0700 |
commit | de481f78f0263281c78522f4af2688a1414932f9 (patch) | |
tree | 7c1a24d671042266be5b060caab8f34050edf582 | |
parent | b2a169f08a73300d0ee51c5cbd211d29de1cf62f (diff) |
Add void's to eliminate Xcode 9.1 warnings (#352)
-rw-r--r-- | Firebase/Messaging/FIRMessagingLogger.h | 2 | ||||
-rw-r--r-- | Firebase/Messaging/FIRMessagingLogger.m | 2 | ||||
-rw-r--r-- | Firebase/Messaging/FIRMessagingRemoteNotificationsProxy.m | 6 | ||||
-rw-r--r-- | Firebase/Messaging/FIRMessagingUtilities.h | 10 | ||||
-rw-r--r-- | Firebase/Messaging/FIRMessagingUtilities.m | 10 | ||||
-rw-r--r-- | Firebase/Messaging/FIRMessagingVersionUtilities.h | 10 | ||||
-rw-r--r-- | Firebase/Messaging/FIRMessagingVersionUtilities.m | 12 |
7 files changed, 26 insertions, 26 deletions
diff --git a/Firebase/Messaging/FIRMessagingLogger.h b/Firebase/Messaging/FIRMessagingLogger.h index d0ff41a..223ac9c 100644 --- a/Firebase/Messaging/FIRMessagingLogger.h +++ b/Firebase/Messaging/FIRMessagingLogger.h @@ -64,4 +64,4 @@ * * @return the shared FIRMessagingLogger instance */ -FIRMessagingLogger *FIRMessagingSharedLogger(); +FIRMessagingLogger *FIRMessagingSharedLogger(void); diff --git a/Firebase/Messaging/FIRMessagingLogger.m b/Firebase/Messaging/FIRMessagingLogger.m index e8190d7..ee4e771 100644 --- a/Firebase/Messaging/FIRMessagingLogger.m +++ b/Firebase/Messaging/FIRMessagingLogger.m @@ -82,7 +82,7 @@ @end -FIRMessagingLogger *FIRMessagingSharedLogger() { +FIRMessagingLogger *FIRMessagingSharedLogger(void) { static dispatch_once_t onceToken; static FIRMessagingLogger *logger; dispatch_once(&onceToken, ^{ diff --git a/Firebase/Messaging/FIRMessagingRemoteNotificationsProxy.m b/Firebase/Messaging/FIRMessagingRemoteNotificationsProxy.m index 8790132..0b8d92b 100644 --- a/Firebase/Messaging/FIRMessagingRemoteNotificationsProxy.m +++ b/Firebase/Messaging/FIRMessagingRemoteNotificationsProxy.m @@ -509,7 +509,7 @@ void FCM_swizzle_willPresentNotificationWithHandler( FIRMessagingRemoteNotificationsProxy *proxy = [FIRMessagingRemoteNotificationsProxy sharedProxy]; IMP original_imp = [proxy originalImplementationForSelector:_cmd]; - void (^callOriginalMethodIfAvailable)() = ^{ + void (^callOriginalMethodIfAvailable)(void) = ^{ if (original_imp) { ((void (*)(id, SEL, id, id, void (^)(NSUInteger)))original_imp)( self, _cmd, center, notification, handler); @@ -569,12 +569,12 @@ void FCM_swizzle_willPresentNotificationWithHandler( * parameter types from the swizzling implementation. */ void FCM_swizzle_didReceiveNotificationResponseWithHandler( - id self, SEL _cmd, id center, id response, void (^handler)()) { + id self, SEL _cmd, id center, id response, void (^handler)(void)) { FIRMessagingRemoteNotificationsProxy *proxy = [FIRMessagingRemoteNotificationsProxy sharedProxy]; IMP original_imp = [proxy originalImplementationForSelector:_cmd]; - void (^callOriginalMethodIfAvailable)() = ^{ + void (^callOriginalMethodIfAvailable)(void) = ^{ if (original_imp) { ((void (*)(id, SEL, id, id, void (^)(void)))original_imp)( self, _cmd, center, response, handler); diff --git a/Firebase/Messaging/FIRMessagingUtilities.h b/Firebase/Messaging/FIRMessagingUtilities.h index ed9dc83..45770bf 100644 --- a/Firebase/Messaging/FIRMessagingUtilities.h +++ b/Firebase/Messaging/FIRMessagingUtilities.h @@ -43,12 +43,12 @@ FOUNDATION_EXPORT void FIRMessagingSetLastStreamId(GPBMessage *proto, int sid); #pragma mark - Time -FOUNDATION_EXPORT int64_t FIRMessagingCurrentTimestampInSeconds(); -FOUNDATION_EXPORT int64_t FIRMessagingCurrentTimestampInMilliseconds(); +FOUNDATION_EXPORT int64_t FIRMessagingCurrentTimestampInSeconds(void); +FOUNDATION_EXPORT int64_t FIRMessagingCurrentTimestampInMilliseconds(void); #pragma mark - App Info -FOUNDATION_EXPORT NSString *FIRMessagingCurrentAppVersion(); -FOUNDATION_EXPORT NSString *FIRMessagingAppIdentifier(); +FOUNDATION_EXPORT NSString *FIRMessagingCurrentAppVersion(void); +FOUNDATION_EXPORT NSString *FIRMessagingAppIdentifier(void); -FOUNDATION_EXPORT uint64_t FIRMessagingGetFreeDiskSpaceInMB(); +FOUNDATION_EXPORT uint64_t FIRMessagingGetFreeDiskSpaceInMB(void); diff --git a/Firebase/Messaging/FIRMessagingUtilities.m b/Firebase/Messaging/FIRMessagingUtilities.m index 13c7a05..60f3f28 100644 --- a/Firebase/Messaging/FIRMessagingUtilities.m +++ b/Firebase/Messaging/FIRMessagingUtilities.m @@ -127,17 +127,17 @@ void FIRMessagingSetLastStreamId(GPBMessage *proto, int sid) { #pragma mark - Time -int64_t FIRMessagingCurrentTimestampInSeconds() { +int64_t FIRMessagingCurrentTimestampInSeconds(void) { return (int64_t)[[NSDate date] timeIntervalSince1970]; } -int64_t FIRMessagingCurrentTimestampInMilliseconds() { +int64_t FIRMessagingCurrentTimestampInMilliseconds(void) { return (int64_t)(FIRMessagingCurrentTimestampInSeconds() * 1000.0); } #pragma mark - App Info -NSString *FIRMessagingCurrentAppVersion() { +NSString *FIRMessagingCurrentAppVersion(void) { NSString *version = [[NSBundle mainBundle] infoDictionary][@"CFBundleShortVersionString"]; if (![version length]) { FIRMessagingLoggerError(kFIRMessagingMessageCodeUtilities000, @@ -147,11 +147,11 @@ NSString *FIRMessagingCurrentAppVersion() { return version; } -NSString *FIRMessagingAppIdentifier() { +NSString *FIRMessagingAppIdentifier(void) { return [[NSBundle mainBundle] bundleIdentifier]; } -uint64_t FIRMessagingGetFreeDiskSpaceInMB() { +uint64_t FIRMessagingGetFreeDiskSpaceInMB(void) { NSError *error; NSArray *paths = NSSearchPathForDirectoriesInDomains(NSDocumentDirectory, NSUserDomainMask, YES); diff --git a/Firebase/Messaging/FIRMessagingVersionUtilities.h b/Firebase/Messaging/FIRMessagingVersionUtilities.h index df7cebe..cd292af 100644 --- a/Firebase/Messaging/FIRMessagingVersionUtilities.h +++ b/Firebase/Messaging/FIRMessagingVersionUtilities.h @@ -24,12 +24,12 @@ * Some example semantic versions are 1.0.1, 2.1.0, 2.1.1, 2.2.0-alpha1, 2.2.1-beta1 */ -FOUNDATION_EXPORT NSString *FIRMessagingCurrentLibraryVersion(); +FOUNDATION_EXPORT NSString *FIRMessagingCurrentLibraryVersion(void); /// Returns the current Major version of FIRMessaging library. -FOUNDATION_EXPORT int FIRMessagingCurrentLibraryVersionMajor(); +FOUNDATION_EXPORT int FIRMessagingCurrentLibraryVersionMajor(void); /// Returns the current Minor version of FIRMessaging library. -FOUNDATION_EXPORT int FIRMessagingCurrentLibraryVersionMinor(); +FOUNDATION_EXPORT int FIRMessagingCurrentLibraryVersionMinor(void); /// Returns the current Patch version of FIRMessaging library. -FOUNDATION_EXPORT int FIRMessagingCurrentLibraryVersionPatch(); +FOUNDATION_EXPORT int FIRMessagingCurrentLibraryVersionPatch(void); /// Returns YES if current library version is `beta` else NO. -FOUNDATION_EXPORT BOOL FIRMessagingCurrentLibraryVersionIsBeta(); +FOUNDATION_EXPORT BOOL FIRMessagingCurrentLibraryVersionIsBeta(void); diff --git a/Firebase/Messaging/FIRMessagingVersionUtilities.m b/Firebase/Messaging/FIRMessagingVersionUtilities.m index e0f922c..1a3333c 100644 --- a/Firebase/Messaging/FIRMessagingVersionUtilities.m +++ b/Firebase/Messaging/FIRMessagingVersionUtilities.m @@ -31,7 +31,7 @@ static int minorVersion; static int patchVersion; static int betaVersion; -void FIRMessagingParseCurrentLibraryVersion() { +void FIRMessagingParseCurrentLibraryVersion(void) { static NSArray *allVersions; static dispatch_once_t onceToken; dispatch_once(&onceToken, ^{ @@ -61,27 +61,27 @@ void FIRMessagingParseCurrentLibraryVersion() { }); } -NSString *FIRMessagingCurrentLibraryVersion() { +NSString *FIRMessagingCurrentLibraryVersion(void) { FIRMessagingParseCurrentLibraryVersion(); return libraryVersion; } -int FIRMessagingCurrentLibraryVersionMajor() { +int FIRMessagingCurrentLibraryVersionMajor(void) { FIRMessagingParseCurrentLibraryVersion(); return majorVersion; } -int FIRMessagingCurrentLibraryVersionMinor() { +int FIRMessagingCurrentLibraryVersionMinor(void) { FIRMessagingParseCurrentLibraryVersion(); return minorVersion; } -int FIRMessagingCurrentLibraryVersionPatch() { +int FIRMessagingCurrentLibraryVersionPatch(void) { FIRMessagingParseCurrentLibraryVersion(); return patchVersion; } -BOOL FIRMessagingCurrentLibraryVersionIsBeta() { +BOOL FIRMessagingCurrentLibraryVersionIsBeta(void) { FIRMessagingParseCurrentLibraryVersion(); return betaVersion > 0; } |