Merge branch 'master' into develop

Conflicts:
	CoreStore.podspec
	CoreStore/Info.plist
	CoreStore/Saving and Processing/DataStack+Transaction.swift
This commit is contained in:
John Estropia
2015-07-09 19:01:23 +09:00

View File

@@ -41,11 +41,6 @@ public extension DataStack {
*/
public func beginAsynchronous(closure: (transaction: AsynchronousDataTransaction) -> Void) {
CoreStore.assert(
NSThread.isMainThread(),
"Attempted to begin a transaction from a \(typeName(self)) outside the main thread."
)
AsynchronousDataTransaction(
mainContext: self.rootSavingContext,
queue: self.childTransactionQueue,
@@ -60,11 +55,6 @@ public extension DataStack {
*/
public func beginSynchronous(closure: (transaction: SynchronousDataTransaction) -> Void) -> SaveResult? {
CoreStore.assert(
NSThread.isMainThread(),
"Attempted to begin a transaction from a \(typeName(self)) outside the main thread."
)
return SynchronousDataTransaction(
mainContext: self.rootSavingContext,
queue: self.childTransactionQueue,
@@ -78,11 +68,6 @@ public extension DataStack {
*/
public func beginDetached() -> DetachedDataTransaction {
CoreStore.assert(
NSThread.isMainThread(),
"Attempted to begin a transaction from a \(typeName(self)) outside the main thread."
)
return DetachedDataTransaction(
mainContext: self.rootSavingContext,
queue: .Main)