Skip to content

Commit 2c0352c

Browse files
committed
Remove UTF32Char since that derives from MacTypes
1 parent 1996379 commit 2c0352c

File tree

3 files changed

+5
-5
lines changed

3 files changed

+5
-5
lines changed

Foundation/CharacterSet.swift

+1-1
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ internal final class _SwiftNSCharacterSet : NSCharacterSet, _SwiftNativeFoundati
7676
return _mapUnmanaged { $0.characterIsMember(member) }
7777
}
7878

79-
override func longCharacterIsMember(_ member: UTF32Char) -> Bool {
79+
override func longCharacterIsMember(_ member: UInt32) -> Bool {
8080
return _mapUnmanaged { $0.longCharacterIsMember(member) }
8181
}
8282

Foundation/NSCFCharacterSet.swift

+2-2
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ internal class _NSCFCharacterSet : NSMutableCharacterSet {
2626
return CFCharacterSetCreateInvertedSet(kCFAllocatorSystemDefault, _cfObject)._swiftObject
2727
}
2828

29-
override func longCharacterIsMember(_ theLongChar: UTF32Char) -> Bool {
29+
override func longCharacterIsMember(_ theLongChar: UInt32) -> Bool {
3030
return CFCharacterSetIsLongCharacterMember(_cfObject, theLongChar)
3131
}
3232

@@ -96,7 +96,7 @@ internal func _CFSwiftCharacterSetMutableCopy(_ cset: CFTypeRef) -> Unmanaged<C
9696
return Unmanaged.passRetained((cset as! NSCharacterSet).mutableCopy() as! CFMutableCharacterSet)
9797
}
9898

99-
internal func _CFSwiftCharacterSetLongCharacterIsMember(_ cset: CFTypeRef, _ ch:UTF32Char) -> Bool {
99+
internal func _CFSwiftCharacterSetLongCharacterIsMember(_ cset: CFTypeRef, _ ch:UInt32) -> Bool {
100100
return (cset as! NSCharacterSet).longCharacterIsMember(ch)
101101
}
102102

Foundation/NSCharacterSet.swift

+2-2
Original file line numberDiff line numberDiff line change
@@ -159,7 +159,7 @@ public class NSCharacterSet : NSObject, NSCopying, NSMutableCopying, NSCoding {
159159
}
160160

161161
public func characterIsMember(_ aCharacter: unichar) -> Bool {
162-
return longCharacterIsMember(UTF32Char(aCharacter))
162+
return longCharacterIsMember(UInt32(aCharacter))
163163
}
164164

165165
public var bitmapRepresentation: Data {
@@ -172,7 +172,7 @@ public class NSCharacterSet : NSObject, NSCopying, NSMutableCopying, NSCoding {
172172
return copy._swiftObject
173173
}
174174

175-
public func longCharacterIsMember(_ theLongChar: UTF32Char) -> Bool {
175+
public func longCharacterIsMember(_ theLongChar: UInt32) -> Bool {
176176
if self.dynamicType == NSCharacterSet.self || self.dynamicType == NSMutableCharacterSet.self {
177177
return _CFCharacterSetIsLongCharacterMember(unsafeBitCast(self, to: CFType.self), theLongChar)
178178
} else if self.dynamicType == _NSCFCharacterSet.self {

0 commit comments

Comments
 (0)