From 6986467d0ea4a8a309a26588748352a88014e635 Mon Sep 17 00:00:00 2001 From: Max Shavrick Date: Tue, 1 Sep 2015 02:23:04 -0400 Subject: [PATCH 1/2] Implemented NSEqualRanges() --- Frameworks/Foundation/Utils.mm | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/Frameworks/Foundation/Utils.mm b/Frameworks/Foundation/Utils.mm index 83bec04609..e611ed2c52 100644 --- a/Frameworks/Foundation/Utils.mm +++ b/Frameworks/Foundation/Utils.mm @@ -54,8 +54,7 @@ NSRange NSUnionRange(NSRange range1, NSRange range2) BOOL NSEqualRanges(NSRange range1, NSRange range2) { - assert(0); - return false; + return ((range1.location == range2.location) && (range1.length == range2.length)); } NSArray *NSSearchPathForDirectoriesInDomains (NSSearchPathDirectory dir, NSSearchPathDomainMask mask, BOOL tilde) From 8c89205e5f50748436ea39fdf2291884f68978d2 Mon Sep 17 00:00:00 2001 From: Artem Simonov Date: Tue, 1 Sep 2015 11:16:24 -0700 Subject: [PATCH 2/2] UITableViewController should conform to NSCoding protocol. --- include/UIKit/UITableViewController.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/include/UIKit/UITableViewController.h b/include/UIKit/UITableViewController.h index daad37f4d6..d26a21318a 100644 --- a/include/UIKit/UITableViewController.h +++ b/include/UIKit/UITableViewController.h @@ -36,7 +36,7 @@ @class UIRefreshControl, UITableViewDataSource; UIKIT_EXPORT_CLASS -@interface UITableViewController : UIViewController +@interface UITableViewController : UIViewController - (id)initWithStyle:(UITableViewStyle)style; @@ -46,4 +46,4 @@ UIKIT_EXPORT_CLASS @end -#endif /* _UITABLEVIEWCONTROLLER_H_ */ \ No newline at end of file +#endif /* _UITABLEVIEWCONTROLLER_H_ */