Skip to content

Commit 1d82076

Browse files
committed
Fixes for incorrect merge resolution of NSTask, NSPipe was renamed to Pipe
1 parent 535505e commit 1d82076

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

Foundation/NSTask.swift

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -315,7 +315,7 @@ public class Task: NSObject {
315315
var addclose = Set<Int32>()
316316

317317
switch standardInput {
318-
case let pipe as NSPipe:
318+
case let pipe as Pipe:
319319
adddup2[STDIN_FILENO] = pipe.fileHandleForReading.fileDescriptor
320320
addclose.insert(pipe.fileHandleForWriting.fileDescriptor)
321321
case let handle as FileHandle:
@@ -324,7 +324,7 @@ public class Task: NSObject {
324324
}
325325

326326
switch standardOutput {
327-
case let pipe as NSPipe:
327+
case let pipe as Pipe:
328328
adddup2[STDOUT_FILENO] = pipe.fileHandleForWriting.fileDescriptor
329329
addclose.insert(pipe.fileHandleForReading.fileDescriptor)
330330
case let handle as FileHandle:
@@ -333,7 +333,7 @@ public class Task: NSObject {
333333
}
334334

335335
switch standardError {
336-
case let pipe as NSPipe:
336+
case let pipe as Pipe:
337337
adddup2[STDERR_FILENO] = pipe.fileHandleForWriting.fileDescriptor
338338
addclose.insert(pipe.fileHandleForReading.fileDescriptor)
339339
case let handle as FileHandle:

0 commit comments

Comments
 (0)