Merge pull request #6 from interlock/master

Conditional ARC support
RVLVR · Mar 18, 2012 · f24a90d · f24a90d
2 parents 429f99a + ef0af14
commit f24a90d
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 2 deletions.
diff --git a/REVClusterMap/REVClusterMap/REVAnnotationsCollection.m b/REVClusterMap/REVClusterMap/REVAnnotationsCollection.m
@@ -44,10 +44,11 @@ - (NSUInteger) count
     return [collection count];
 }
 
-
+#if !__has_feature(objc_arc)
 -(void)dealloc
 {
     [collection release], collection = nil;
     [super dealloc];
 }
+#endif
 @end
diff --git a/REVClusterMap/REVClusterMap/REVClusterBlock.m b/REVClusterMap/REVClusterMap/REVClusterBlock.m
@@ -40,8 +40,11 @@ - (void) addAnnotation:(id<MKAnnotation>)annotation
         double y = [annotationsCollection ySum] / [annotationsCollection count];
 
         CLLocationCoordinate2D location = MKCoordinateForMapPoint(MKMapPointMake(x, y));
-
+        #if !__has_feature(objc_arc)
         REVClusterPin *pin = [[[REVClusterPin alloc] init] autorelease];
+#else
+        REVClusterPin *pin = [[REVClusterPin alloc] init];
+#endif
         pin.coordinate = location;
         pin.nodes = [annotationsCollection collection];
         return pin;
@@ -60,10 +63,12 @@ - (NSString*) description
     return [NSString stringWithFormat:@"%i annotations",[self count]];
 }
 
+#if !__has_feature(objc_arc)
 - (void) dealloc
 {
     [annotationsCollection release], annotationsCollection = nil;
     [super dealloc];
 }
+#endif
 
 @end
diff --git a/REVClusterMap/REVClusterMap/REVClusterManager.m b/REVClusterMap/REVClusterMap/REVClusterManager.m
@@ -63,7 +63,9 @@ + (NSArray *) clusterAnnotationsForMapView:(MKMapView *)mapView forAnnotations:(
     {
         REVClusterBlock *block = [[REVClusterBlock alloc] init];
         [clusteredBlocks addObject:block];
+        #if !__has_feature(objc_arc)
         [block release];  
+#endif
     }
 
     for (REVClusterPin *pin in visibleAnnotations)

diff --git a/REVClusterMap/REVClusterMap/REVClusterMapView.m b/REVClusterMap/REVClusterMap/REVClusterMapView.m
@@ -56,11 +56,13 @@ - (void) setup
     zoomLevel = self.visibleMapRect.size.width * self.visibleMapRect.size.height;
 }
 
+#if !__has_feature(objc_arc)
 - (void)dealloc
 {
     [annotationsCopy release];
     [super dealloc];
 }
+#endif
 
 -(MKOverlayView *)mapView:(MKMapView *)mapView viewForOverlay:(id <MKOverlay>)overlay
 {
@@ -221,7 +223,9 @@ - (BOOL) mapViewDidZoom
 
 - (void) addAnnotations:(NSArray *)annotations
 {
+    #if !__has_feature(objc_arc)
     [annotationsCopy release];
+#endif
     annotationsCopy = [annotations copy];
 
     NSArray *add = [REVClusterManager clusterAnnotationsForMapView:self forAnnotations:annotations blocks:self.blocks minClusterLevel:self.minimumClusterLevel];

diff --git a/REVClusterMap/REVClusterMap/REVClusterPin.m b/REVClusterMap/REVClusterMap/REVClusterPin.m
@@ -22,11 +22,14 @@ - (NSUInteger) nodeCount
     return 0;
 }
 
+#if !__has_feature(objc_arc)
 - (void)dealloc
 {
     [title release];
     [subtitle release];
     [nodes release];
     [super dealloc];
 }
+#endif
+
 @end