Remove the underscored public protocols from overlays

These protocols were introduced to work around the problem where
compiler could not correctly handle instance of multiple @available
attributes (one for the language version and another for teh OS version)
applied to the same member.

Now that the compiler issues has been fixed, it is the right time to get
rid of the workarounds.

Addresses: <rdar://problem/36556261>
This commit is contained in:
Max Moiseev
2018-03-30 13:43:38 -07:00
parent 3b14d11aaa
commit a582a7628c
3 changed files with 9 additions and 43 deletions

View File

@@ -16,13 +16,8 @@ import Foundation
#if os(iOS)
public protocol _AVCapturePhotoOutputSwiftNativeTypes {
var __supportedFlashModes: [NSNumber] { get }
var __availablePhotoPixelFormatTypes: [NSNumber] { get }
var __availableRawPhotoPixelFormatTypes: [NSNumber] { get }
}
extension _AVCapturePhotoOutputSwiftNativeTypes {
@available(iOS, introduced: 10.0)
extension AVCapturePhotoOutput {
@available(swift, obsoleted: 4.0)
@available(iOS, introduced: 10.0)
@nonobjc
@@ -67,15 +62,7 @@ extension _AVCapturePhotoOutputSwiftNativeTypes {
}
@available(iOS, introduced: 10.0)
extension AVCapturePhotoOutput : _AVCapturePhotoOutputSwiftNativeTypes {
}
public protocol _AVCapturePhotoSettingsSwiftNativeTypes {
var __availablePreviewPhotoPixelFormatTypes: [NSNumber] { get }
}
extension _AVCapturePhotoSettingsSwiftNativeTypes {
extension AVCapturePhotoSettings {
@available(swift, obsoleted: 4.0)
@available(iOS, introduced: 10.0)
@nonobjc
@@ -91,8 +78,4 @@ extension _AVCapturePhotoSettingsSwiftNativeTypes {
}
}
@available(iOS, introduced: 10.0)
extension AVCapturePhotoSettings : _AVCapturePhotoSettingsSwiftNativeTypes {
}
#endif