Skip to content

Commit e7e9a32

Browse files
authored
Merge pull request swiftlang#124 from jpsim/jp-overlay-fixes
fix issues preventing overlay from compiling due to SE-0025
2 parents 0d9ea5f + 5d86816 commit e7e9a32

File tree

3 files changed

+6
-6
lines changed

3 files changed

+6
-6
lines changed

src/swift/Data.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ public struct DispatchData : RandomAccessCollection {
3535
// which is only made available on platforms with Objective-C.
3636
case custom(DispatchQueue?, () -> Void)
3737

38-
private var _deallocator: (DispatchQueue?, @convention(block) () -> Void) {
38+
fileprivate var _deallocator: (DispatchQueue?, @convention(block) () -> Void) {
3939
switch self {
4040
case .free: return (nil, _dispatch_data_destructor_free())
4141
case .unmap: return (nil, _dispatch_data_destructor_munmap())

src/swift/Queue.swift

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ public struct DispatchQueueAttributes : OptionSet {
3232
public static let serial = DispatchQueueAttributes(rawValue: 1<<0)
3333
public static let concurrent = DispatchQueueAttributes(rawValue: 1<<1)
3434

35-
private var _translatedValue: DispatchQueue.Attributes {
35+
fileprivate var _translatedValue: DispatchQueue.Attributes {
3636
if self.contains(.concurrent) { return .concurrent }
3737
return []
3838
}
@@ -48,7 +48,7 @@ public extension DispatchQueue {
4848
@available(OSX 10.12, iOS 10.0, tvOS 10.0, watchOS 3.0, *)
4949
public static let initiallyInactive = Attributes(rawValue: 1<<2)
5050

51-
private func _attr() -> dispatch_queue_attr_t? {
51+
fileprivate func _attr() -> dispatch_queue_attr_t? {
5252
var attr: dispatch_queue_attr_t? = nil
5353

5454
if self.contains(.concurrent) {
@@ -95,7 +95,7 @@ public extension DispatchQueue {
9595
public enum GlobalQueueDeprecatedPriority {
9696
case qosBackground
9797

98-
private var _translatedValue: DispatchQoS.QoSClass {
98+
fileprivate var _translatedValue: DispatchQoS.QoSClass {
9999
switch self {
100100
case .qosBackground: return .background
101101
}

src/swift/Time.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ public struct DispatchTime : Comparable {
2626

2727
public static let distantFuture = DispatchTime(rawValue: ~0)
2828

29-
private init(rawValue: dispatch_time_t) {
29+
fileprivate init(rawValue: dispatch_time_t) {
3030
self.rawValue = rawValue
3131
}
3232

@@ -64,7 +64,7 @@ public struct DispatchWallTime : Comparable {
6464

6565
public static let distantFuture = DispatchWallTime(rawValue: ~0)
6666

67-
private init(rawValue: dispatch_time_t) {
67+
fileprivate init(rawValue: dispatch_time_t) {
6868
self.rawValue = rawValue
6969
}
7070

0 commit comments

Comments
 (0)