Skip to content

Fix build failure for importing NSUInteger as Int instead of the previously tested ok UInt #7979

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
Mar 10, 2017
Merged

Fix build failure for importing NSUInteger as Int instead of the previously tested ok UInt #7979

Show file tree
Hide file tree
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
4 changes: 0 additions & 4 deletions lib/ClangImporter/ClangImporter.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -323,11 +323,7 @@ void ClangImporter::clearTypeResolver() {

#pragma mark Module loading

#ifdef NDEBUG
#define SHIMS_INCLUDE_FLAG "-isystem"
#else
#define SHIMS_INCLUDE_FLAG "-I"
#endif

static StringRef
getMinVersionOptNameForDarwinTriple(const llvm::Triple &triple) {
Expand Down
6 changes: 3 additions & 3 deletions stdlib/public/SDK/Foundation/Data.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -875,11 +875,11 @@ public struct Data : ReferenceConvertible, Equatable, Hashable, RandomAccessColl
#else
switch self {
case .virtualMemory:
return { NSDataDeallocatorVM($0, UInt($1)) }
return { NSDataDeallocatorVM($0, $1) }
case .unmap:
return { NSDataDeallocatorUnmap($0, UInt($1)) }
return { NSDataDeallocatorUnmap($0, $1) }
case .free:
return { NSDataDeallocatorFree($0, UInt($1)) }
return { NSDataDeallocatorFree($0, $1) }
case .none:
return { _, _ in }
case .custom(let b):
Expand Down
10 changes: 5 additions & 5 deletions stdlib/public/SDK/Foundation/IndexSet.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -258,9 +258,9 @@ public struct IndexSet : ReferenceConvertible, Equatable, BidirectionalCollectio

private func _indexOfRange(containing integer : Element) -> RangeView.Index? {
let result = _handle.map {
__NSIndexSetIndexOfRangeContainingIndex($0, UInt(integer))
__NSIndexSetIndexOfRangeContainingIndex($0, integer)
}
if result == UInt(NSNotFound) {
if result == NSNotFound {
return nil
} else {
return Int(result)
Expand All @@ -269,9 +269,9 @@ public struct IndexSet : ReferenceConvertible, Equatable, BidirectionalCollectio

private func _range(at index: RangeView.Index) -> Range<Element> {
return _handle.map {
var location: UInt = 0
var length: UInt = 0
__NSIndexSetRangeAtIndex($0, UInt(index), &location, &length)
var location: Int = 0
var length: Int = 0
__NSIndexSetRangeAtIndex($0, index, &location, &length)
return Int(location)..<Int(location)+Int(length)
}
}
Expand Down
2 changes: 1 addition & 1 deletion stdlib/public/SDK/Foundation/NSDictionary.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -233,7 +233,7 @@ extension NSDictionary {
let valueBuffer = buffer.bindMemory(to: AnyObject.self, capacity: numElems)
let buffer2 = buffer + singleSize

__NSDictionaryGetObjects(otherDictionary, buffer, buffer2, UInt(numElems))
__NSDictionaryGetObjects(otherDictionary, buffer, buffer2, numElems)

let keyBufferCopying = buffer2.assumingMemoryBound(to: NSCopying.self)
self.init(objects: valueBuffer, forKeys: keyBufferCopying, count: numElems)
Expand Down