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

Merge branch 'master' into develop

Browse Source 
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
parent 7e0d3120e1 e0048f589c
commit 450afb00fa
1 changed files with 0 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
CoreStore/Saving and Processing/DataStack+Transaction.swift
View File

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