[ClangImporter] Imported NS_OPTIONS structs should not conform to BooleanType.

In general, RawOptionSetType no longer inherits from BooleanType.

Swift SVN r20846
This commit is contained in:
Jordan Rose
2014-07-31 19:23:08 +00:00
parent 904264544d
commit a627411b43
11 changed files with 9 additions and 104 deletions

View File

@@ -193,8 +193,7 @@ public prefix func ~ <T: _RawOptionSetType>(a: T) -> T {
}
// TODO: This is an incomplete implementation of our option sets vision.
public protocol RawOptionSetType : _RawOptionSetType, BooleanType,
BitwiseOperationsType,
public protocol RawOptionSetType : _RawOptionSetType, BitwiseOperationsType,
NilLiteralConvertible {
// FIXME: Disabled pending <rdar://problem/14011860> (Default
// implementations in protocols)