Merge pull request #1 from tamasprezi/fix/nullability_xcode6

Fixed nullability issues
lvsti · Nov 23, 2015 · fe17d17 · fe17d17
2 parents 4b1931c + c0e8cb5
commit fe17d17
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/SevenZip/SVZArchive.mm b/SevenZip/SVZArchive.mm
@@ -55,17 +55,17 @@ @interface SVZArchive ()
 
 @implementation SVZArchive
 
-+ (nullable instancetype)archiveWithURL:(NSURL*)aURL
-                        createIfMissing:(BOOL)aShouldCreate
-                                  error:(NSError**)aError {
++ (SVZ_NULLABLE instancetype)archiveWithURL:(NSURL*)aURL
+                            createIfMissing:(BOOL)aShouldCreate
+                                      error:(NSError**)aError {
     return [[self alloc] initWithURL:aURL
                      createIfMissing:aShouldCreate
                                error:aError];
 }
 
-- (nullable instancetype)initWithURL:(NSURL*)aURL
-                     createIfMissing:(BOOL)aShouldCreate
-                               error:(NSError**)aError {
+- (SVZ_NULLABLE instancetype)initWithURL:(NSURL*)aURL
+                         createIfMissing:(BOOL)aShouldCreate
+                                   error:(NSError**)aError {
     NSParameterAssert(aURL);
     NSAssert([aURL isFileURL], @"url must point to a local file");
 

diff --git a/SevenZip/SVZArchiveEntry.m b/SevenZip/SVZArchiveEntry.m
@@ -18,7 +18,7 @@ + (instancetype)archiveEntryWithFileName:(NSString*)aFileName
 }
 
 - (instancetype)initWithName:(NSString*)aFileName
-                         url:(NSURL* _Nullable)aFileURL {
+                         url:(NSURL* SVZ_NULLABLE_ARG)aFileURL {
     NSParameterAssert(aFileName);
     NSAssert(!aFileURL || [aFileURL isFileURL], @"fileURL must point to a local file");