2
0
Эх сурвалжийг харах

Merge branch 'pr/200'

# Conflicts:
#	MJRefreshExample/MJRefreshExample/Classes/MJCollectionViewController.m
#	MJRefreshExample/MJRefreshExample/Classes/MJTableViewController.m
MJLee 10 жил өмнө
parent
commit
43de89f1bb

+ 3 - 4
MJRefreshExample/MJRefreshExample/Classes/MJCollectionViewController.m

@@ -96,10 +96,9 @@ - (void)viewDidLoad
 {
     [super viewDidLoad];
     
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Warc-performSelector-leaks"
-    [self performSelector:NSSelectorFromString(self.method) withObject:nil];
-#pragma clang diagnostic pop
+    MJPerformSelectorLeakWarning(
+        [self performSelector:NSSelectorFromString(self.method) withObject:nil];
+                                 );
     
     self.collectionView.backgroundColor = [UIColor whiteColor];
     [self.collectionView registerClass:[UICollectionViewCell class] forCellWithReuseIdentifier:MJCollectionViewCellIdentifier];

+ 3 - 6
MJRefreshExample/MJRefreshExample/Classes/MJTableViewController.m

@@ -338,13 +338,10 @@ - (void)viewDidLoad
     [super viewDidLoad];
     
     self.tableView.separatorStyle = UITableViewCellSeparatorStyleNone;
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Warc-performSelector-leaks"
-    [self performSelector:NSSelectorFromString(self.method) withObject:nil];
-#pragma clang diagnostic pop
-    
-    
     [self.tableView registerNib:[UINib nibWithNibName:@"MJTableViewCell" bundle:nil] forCellReuseIdentifier:@"cell"];
+    MJPerformSelectorLeakWarning(
+        [self performSelector:NSSelectorFromString(self.method) withObject:nil];
+                                 );
 }
 
 - (NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section

+ 8 - 0
MJRefreshExample/MJRefreshExample/Classes/MJTestViewController.h

@@ -9,6 +9,14 @@
 
 #import <UIKit/UIKit.h>
 
+#define MJPerformSelectorLeakWarning(Stuff) \
+do { \
+_Pragma("clang diagnostic push") \
+_Pragma("clang diagnostic ignored \"-Warc-performSelector-leaks\"") \
+Stuff; \
+_Pragma("clang diagnostic pop") \
+} while (0)
+
 @interface MJTestViewController : UIViewController
 
 @end