Merge branch 'master' of github.com:Masonry/Snappy

This commit is contained in:
Robert Payne 2014-09-19 03:05:12 +12:00
commit 236e62521d
1 changed files with 2 additions and 1 deletions

View File

@ -31,7 +31,7 @@ import AppKit
/** /**
* ConstraintAttributes is an options set that maps to NSLayoutAttributes. * ConstraintAttributes is an options set that maps to NSLayoutAttributes.
*/ */
struct ConstraintAttributes: RawOptionSetType { struct ConstraintAttributes: RawOptionSetType, BooleanType {
var value: UInt var value: UInt
var boolValue: Bool { var boolValue: Bool {
@ -43,6 +43,7 @@ struct ConstraintAttributes: RawOptionSetType {
} }
func toRaw() -> UInt { return self.value } func toRaw() -> UInt { return self.value }
func getLogicValue() -> Bool { return self.value != 0 } func getLogicValue() -> Bool { return self.value != 0 }
static var allZeros: ConstraintAttributes { return self(0) }
static func fromRaw(raw: UInt) -> ConstraintAttributes? { return self(raw) } static func fromRaw(raw: UInt) -> ConstraintAttributes? { return self(raw) }
static func fromMask(raw: UInt) -> ConstraintAttributes { return self(raw) } static func fromMask(raw: UInt) -> ConstraintAttributes { return self(raw) }
static func convertFromNilLiteral() -> ConstraintAttributes { return self(0) } static func convertFromNilLiteral() -> ConstraintAttributes { return self(0) }