Skip to content

Sync with the Swift repository on the _silgen_name thing #1428

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Feb 9, 2018
Merged

Sync with the Swift repository on the _silgen_name thing #1428

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 2 additions & 5 deletions Foundation/Data.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,9 +54,6 @@ internal func __NSDataIsCompact(_ data: NSData) -> Bool {
}
}

@_silgen_name("__NSDataWriteToURL")
internal func __NSDataWriteToURL(_ data: NSData, _ url: NSURL, _ options: UInt, _ error: NSErrorPointer) -> Bool

#endif

public final class _DataStorage {
Expand Down Expand Up @@ -1417,9 +1414,9 @@ public struct Data : ReferenceConvertible, Equatable, Hashable, RandomAccessColl
#else
if _shouldUseNonAtomicWriteReimplementation(options: options) {
var error: NSError? = nil
guard __NSDataWriteToURL($0, url as NSURL, options.rawValue, &error) else { throw error! }
guard __NSDataWriteToURL($0, url, options, &error) else { throw error! }
} else {
try $0.write(to: url, options: WritingOptions(rawValue: options.rawValue))
try $0.write(to: url, options: options)
}
#endif
}
Expand Down