Skip to content

Commit

Permalink
[OPR-256]: Cleans up the file MARKs
Browse files Browse the repository at this point in the history
  • Loading branch information
danthorpe committed Mar 29, 2016
1 parent a2a2b6c commit 453cc15
Showing 1 changed file with 3 additions and 6 deletions.
9 changes: 3 additions & 6 deletions Sources/Core/Shared/Operation.swift
Original file line number Diff line number Diff line change
Expand Up @@ -234,6 +234,8 @@ public class Operation: NSOperation {
// No op.
}

// MARK: - Cancellation

/**
Cancel the operation with an error.

Expand All @@ -256,8 +258,6 @@ public class Operation: NSOperation {
cancel()
}

// MARK: - Cancellation

public override func cancel() {
if !finished {

Expand Down Expand Up @@ -358,8 +358,6 @@ public extension Operation {

public extension Operation {

// MARK: - Dependencies

private func createDidFinishDependenciesOperation() -> NSOperation {
assert(waitForDependenciesOperation == nil, "Should only ever create the finishing dependency once.")
let __op = NSBlockOperation { }
Expand All @@ -381,8 +379,7 @@ public extension Operation {
get {
var _dependencies = super.dependencies
guard let
waiter = waitForDependenciesOperation,
index = _dependencies.indexOf(waiter) else {
waiter = waitForDependenciesOperation, index = _dependencies.indexOf(waiter) else {
return _dependencies
}

Expand Down

0 comments on commit 453cc15

Please sign in to comment.