Merge branch 'ARC'

epreston · Oct 13, 2013 · 54ce784 · 54ce784
2 parents 17868e9 + 9841b49
commit 54ce784
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/Example 1/Classes/Model/ObjCClass/ObjCClassWrapper.m b/Example 1/Classes/Model/ObjCClass/ObjCClassWrapper.m
@@ -115,7 +115,7 @@ - (NSArray *) subclasses
         Class* classes = NULL;
         while (numClasses < newNumClasses) {
             numClasses = newNumClasses;
-            classes = realloc(classes, sizeof(Class) * numClasses);
+            classes = (Class*)realloc(classes, sizeof(Class) * numClasses);
             newNumClasses = objc_getClassList(classes, numClasses);
         }
 

diff --git a/PSTreeGraphView/PSBaseTreeGraphView.m b/PSTreeGraphView/PSBaseTreeGraphView.m
@@ -32,8 +32,8 @@ @interface PSBaseTreeGraphView ()
 	// Model
     id <PSTreeGraphModelNode> modelRoot_;
 
-	// Delegate
-	id <PSTreeGraphDelegate> delegate_;
+    // Delegate
+    __weak id <PSTreeGraphDelegate> delegate_;
 
     // Model Object -> SubtreeView Mapping
 	NSMutableDictionary *modelNodeToSubtreeViewMapTable_;