Merge pull request #421 from facebook/xcode-6-3

Xcode 6.3 support
This commit is contained in:
Ryan Nystrom
2015-04-08 16:44:50 -07:00
6 changed files with 14 additions and 7 deletions

View File

@@ -22,7 +22,6 @@
@end
@interface ASActionController : ReceiverController
@property (nonatomic) NSInteger hits;
@end
@implementation ASActionController
- (void)action { self.hits++; }

View File

@@ -834,9 +834,9 @@ static void _addTonsOfSubnodes(ASDisplayNode *parent, NSUInteger fanout, NSUInte
}
static inline BOOL _CGPointEqualToPointWithEpsilon(CGPoint point1, CGPoint point2, CGFloat epsilon) {
CGFloat absEpsilon = fabsf(epsilon);
BOOL xOK = fabsf(point1.x - point2.x) < absEpsilon;
BOOL yOK = fabsf(point1.y - point2.y) < absEpsilon;
CGFloat absEpsilon = fabs(epsilon);
BOOL xOK = fabs(point1.x - point2.x) < absEpsilon;
BOOL yOK = fabs(point1.y - point2.y) < absEpsilon;
return xOK && yOK;
}

View File

@@ -128,7 +128,7 @@
[self setUpRenderer];
CGSize calculatedSizeWithTruncation = [_renderer size];
// Floating point equality
XCTAssertTrue(fabsf(calculatedSizeWithTruncation.height - calculatedSize.height) < .001, @"The height after truncation (%f) doesn't match the normal calculated height (%f)", calculatedSizeWithTruncation.height, calculatedSize.height);
XCTAssertTrue(fabs(calculatedSizeWithTruncation.height - calculatedSize.height) < .001, @"The height after truncation (%f) doesn't match the normal calculated height (%f)", calculatedSizeWithTruncation.height, calculatedSize.height);
}
- (void)testNoCrashOnTappingEmptyTextNode