starred/CoreStore
1
0
Fork 0
mirror of https://github.com/JohnEstropia/CoreStore.git synced 2026-03-19 16:21:27 +01:00
Code Issues 95 Packages Projects Releases 10 Wiki Activity

Merge branch 'develop' into swift3_develop

Browse Source 
# Conflicts:
#	Cartfile.resolved
#	Carthage/Checkouts/GCDKit
#	CoreStoreTests/ErrorTests.swift
#	Sources/Fetching and Querying/Concrete Clauses/Select.swift
#	Sources/ObjectiveC/CSError.swift
This commit is contained in:
John Rommel Estropia
2016-07-22 00:47:03 +09:00
parent 2f39f9188b 1950224863
commit db5b8ca702
9 changed files with 57 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
Sources/ObjectiveC/CSError.swift
View File

@@ -248,9 +248,17 @@ internal extension ErrorProtocol {
switch self {
case let error as CoreStoreError: return error
case let error as CSError: return error.bridgeToSwift
default: return .unknown
case let error as CoreStoreError:
return error
case let error as CSError:
return error.bridgeToSwift
case let error as NSError where self.dynamicType is NSError.Type:
return .internalError(NSError: error)
default:
return .unknown
}
}
@@ -258,9 +266,14 @@ internal extension ErrorProtocol {
switch self {
case let error as CoreStoreError: return error.bridgeToObjectiveC
case let error as CSError: return error
default: return self as NSError
case let error as CoreStoreError:
return error.bridgeToObjectiveC
case let error as CSError:
return error
default:
return self as NSError
}
}
}