Merge remote-tracking branch 'github/master'

microsoft · Sep 3, 2015 · 7a320b0 · 7a320b0
2 parents e8f7b91 + 8c89205
commit 7a320b0
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
diff --git 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)

diff --git a/include/UIKit/UITableViewController.h b/include/UIKit/UITableViewController.h
@@ -36,7 +36,7 @@
 @class UIRefreshControl, UITableViewDataSource;
 
 UIKIT_EXPORT_CLASS
-@interface UITableViewController : UIViewController<UITableViewDelegate, UITableViewDataSource>
+@interface UITableViewController : UIViewController<UITableViewDelegate, UITableViewDataSource, NSCoding>
 
 - (id)initWithStyle:(UITableViewStyle)style;
 
@@ -46,4 +46,4 @@ UIKIT_EXPORT_CLASS
 
 @end
 
-#endif /* _UITABLEVIEWCONTROLLER_H_ */
+#endif /* _UITABLEVIEWCONTROLLER_H_ */