From eeffac4502bbb6296cf718544ee9ee1dc9f98ada Mon Sep 17 00:00:00 2001 From: Gareth Knowles Date: Wed, 22 Jul 2015 10:41:23 +0100 Subject: [PATCH] Fix Errors in examples for xcode 7 beta 4 --- RxDataSourceStarterKit/SectionModel.swift | 4 ++-- .../WikipediaAPI/WikipediaSearchResult.swift | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/RxDataSourceStarterKit/SectionModel.swift b/RxDataSourceStarterKit/SectionModel.swift index 41573d1b..946d0445 100644 --- a/RxDataSourceStarterKit/SectionModel.swift +++ b/RxDataSourceStarterKit/SectionModel.swift @@ -9,7 +9,7 @@ import Foundation public struct SectionModel : SectionModelType, CustomStringConvertible { - typealias Item = ItemType + public typealias Item = ItemType public var model: Section public var items: [Item] @@ -32,7 +32,7 @@ public struct SectionModel : SectionModelType, CustomStringCo } public struct HashableSectionModel : Hashable, SectionModelType, CustomStringConvertible { - typealias Item = ItemType + public typealias Item = ItemType public var model: Section public var items: [Item] diff --git a/RxExample/RxExample/Examples/WikipediaImageSearch/WikipediaAPI/WikipediaSearchResult.swift b/RxExample/RxExample/Examples/WikipediaImageSearch/WikipediaAPI/WikipediaSearchResult.swift index 6bb782b7..d0c161da 100644 --- a/RxExample/RxExample/Examples/WikipediaImageSearch/WikipediaAPI/WikipediaSearchResult.swift +++ b/RxExample/RxExample/Examples/WikipediaImageSearch/WikipediaAPI/WikipediaSearchResult.swift @@ -30,8 +30,8 @@ struct WikipediaSearchResult: CustomStringConvertible { return failure(WikipediaParseError) } - let titleAndDescription = Array(Zip2(rootArrayTyped[0], rootArrayTyped[1])) - let titleDescriptionAndUrl: [((AnyObject, AnyObject), AnyObject)] = Array(Zip2(titleAndDescription, rootArrayTyped[2])) + let titleAndDescription = Array(Zip2Sequence(rootArrayTyped[0], rootArrayTyped[1])) + let titleDescriptionAndUrl: [((AnyObject, AnyObject), AnyObject)] = Array(Zip2Sequence(titleAndDescription, rootArrayTyped[2])) let searchResults: [RxResult] = titleDescriptionAndUrl.map ( { result -> RxResult in let (first, url) = result