Merge pull request ccgus#549 from michalzelinka/master

Feature-conditional statements for `-finalize` method to opt-out GC methods when using ARC
alexlee002 · Nov 15, 2016 · b0bf040 · b0bf040
2 parents 36f39b8 + ef5b4b7
commit b0bf040
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 0 deletions.
diff --git a/src/fmdb/FMDatabase.m b/src/fmdb/FMDatabase.m
@@ -50,10 +50,12 @@ - (instancetype)initWithPath:(NSString*)aPath {
     return self;
 }
 
+#if ! __has_feature(objc_arc)
 - (void)finalize {
     [self close];
     [super finalize];
 }
+#endif
 
 - (void)dealloc {
     [self close];
@@ -1461,10 +1463,12 @@ @implementation FMStatement
 @synthesize useCount=_useCount;
 @synthesize inUse=_inUse;
 
+#if ! __has_feature(objc_arc)
 - (void)finalize {
     [self close];
     [super finalize];
 }
+#endif
 
 - (void)dealloc {
     [self close];

diff --git a/src/fmdb/FMResultSet.m b/src/fmdb/FMResultSet.m
@@ -30,10 +30,12 @@ + (instancetype)resultSetWithStatement:(FMStatement *)statement usingParentDatab
     return FMDBReturnAutoreleased(rs);
 }
 
+#if ! __has_feature(objc_arc)
 - (void)finalize {
     [self close];
     [super finalize];
 }
+#endif
 
 - (void)dealloc {
     [self close];