Skip to content

Commit 1cd365a

Browse files
committed
Merge pull request swiftlang#285 from ianpartridge/testnsstring-buildbreak
Use Swift 3 CFStringBuiltInEncodings values
2 parents 14ed881 + 68f5172 commit 1cd365a

File tree

1 file changed

+6
-6
lines changed

1 file changed

+6
-6
lines changed

TestFoundation/TestNSString.swift

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -19,14 +19,14 @@ import SwiftXCTest
1919
import CoreFoundation
2020

2121
#if os(OSX) || os(iOS)
22-
internal let kCFStringEncodingMacRoman = CFStringBuiltInEncodings.MacRoman.rawValue
23-
internal let kCFStringEncodingWindowsLatin1 = CFStringBuiltInEncodings.WindowsLatin1.rawValue
24-
internal let kCFStringEncodingISOLatin1 = CFStringBuiltInEncodings.ISOLatin1.rawValue
25-
internal let kCFStringEncodingNextStepLatin = CFStringBuiltInEncodings.NextStepLatin.rawValue
22+
internal let kCFStringEncodingMacRoman = CFStringBuiltInEncodings.macRoman.rawValue
23+
internal let kCFStringEncodingWindowsLatin1 = CFStringBuiltInEncodings.windowsLatin1.rawValue
24+
internal let kCFStringEncodingISOLatin1 = CFStringBuiltInEncodings.isoLatin1.rawValue
25+
internal let kCFStringEncodingNextStepLatin = CFStringBuiltInEncodings.nextStepLatin.rawValue
2626
internal let kCFStringEncodingASCII = CFStringBuiltInEncodings.ASCII.rawValue
27-
internal let kCFStringEncodingUnicode = CFStringBuiltInEncodings.Unicode.rawValue
27+
internal let kCFStringEncodingUnicode = CFStringBuiltInEncodings.unicode.rawValue
2828
internal let kCFStringEncodingUTF8 = CFStringBuiltInEncodings.UTF8.rawValue
29-
internal let kCFStringEncodingNonLossyASCII = CFStringBuiltInEncodings.NonLossyASCII.rawValue
29+
internal let kCFStringEncodingNonLossyASCII = CFStringBuiltInEncodings.nonLossyASCII.rawValue
3030
internal let kCFStringEncodingUTF16 = CFStringBuiltInEncodings.UTF16.rawValue
3131
internal let kCFStringEncodingUTF16BE = CFStringBuiltInEncodings.UTF16BE.rawValue
3232
internal let kCFStringEncodingUTF16LE = CFStringBuiltInEncodings.UTF16LE.rawValue

0 commit comments

Comments
 (0)