Skip to content

Commit d61f390

Browse files
committed
fixes for Swift 3.0
1 parent 82dc3c7 commit d61f390

2 files changed

Lines changed: 7 additions & 1 deletion

File tree

Sources/Protocols.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@ public protocol VectorType : MatrixType, ArrayLiteralConvertible {
110110
typealias DoubleVector
111111
typealias Int32Vector
112112
typealias UInt32Vector
113-
typealias BooleanVector:BooleanVectorType
113+
typealias BooleanVector
114114
// T.BooleanVector == BooleanVector : Must use this key with mixed types.
115115
subscript(_:Int) -> Element { get set }
116116
init<T:VectorType where T.BooleanVector == BooleanVector>(_: T, @noescape _:(_:T.Element) -> Element)

Sources/glsl.swift

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -885,41 +885,47 @@ public func inverse<T:ArithmeticType>(m:Matrix4x4<T>) -> Matrix4x4<T> {
885885

886886
@warn_unused_result
887887
public func lessThan<genType:VectorType where
888+
genType.BooleanVector:BooleanVectorType,
888889
genType.BooleanVector == genType.BooleanVector.BooleanVector
889890
>(x:genType, _ y:genType) -> genType.BooleanVector {
890891
return genType.BooleanVector(x, y, <)
891892
}
892893

893894
@warn_unused_result
894895
public func lessThanEqual<genType:VectorType where
896+
genType.BooleanVector:BooleanVectorType,
895897
genType.BooleanVector == genType.BooleanVector.BooleanVector
896898
>(x:genType, _ y:genType) -> genType.BooleanVector {
897899
return genType.BooleanVector(x, y, <=)
898900
}
899901

900902
@warn_unused_result
901903
public func greaterThan<genType:VectorType where
904+
genType.BooleanVector:BooleanVectorType,
902905
genType.BooleanVector == genType.BooleanVector.BooleanVector
903906
>(x:genType, _ y:genType) -> genType.BooleanVector {
904907
return genType.BooleanVector(x, y, >)
905908
}
906909

907910
@warn_unused_result
908911
public func greaterThanEqual<genType:VectorType where
912+
genType.BooleanVector:BooleanVectorType,
909913
genType.BooleanVector == genType.BooleanVector.BooleanVector
910914
>(x:genType, _ y:genType) -> genType.BooleanVector {
911915
return genType.BooleanVector(x, y, >=)
912916
}
913917

914918
@warn_unused_result
915919
public func equal<genType:VectorType where
920+
genType.BooleanVector:BooleanVectorType,
916921
genType.BooleanVector == genType.BooleanVector.BooleanVector
917922
>(x:genType, _ y:genType) -> genType.BooleanVector {
918923
return genType.BooleanVector(x, y, ==)
919924
}
920925

921926
@warn_unused_result
922927
public func notEqual<genType:VectorType where
928+
genType.BooleanVector:BooleanVectorType,
923929
genType.BooleanVector == genType.BooleanVector.BooleanVector
924930
>(x:genType, _ y:genType) -> genType.BooleanVector {
925931
return genType.BooleanVector(x, y, !=)

0 commit comments

Comments
 (0)