Merge pull request facebookarchive#46 from pixyzehn/master

Fixed a warning due to fabsf on example
Uberchord · May 4, 2015 · f4158b8 · f4158b8
2 parents e21c2e0 + 050c099
commit f4158b8
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/Examples/Logo-iOS/ViewController.m b/Examples/Logo-iOS/ViewController.m
@@ -97,7 +97,11 @@ - (void)_panned:(UIPanGestureRecognizer *)panRecognizer
   CGPoint velocity = [panRecognizer velocityInView:self.view];
 
   if (panRecognizer.state == UIGestureRecognizerStateBegan) {
-    _panVertical = (fabsf(velocity.y) > fabsf(velocity.x));
+#if CGFLOAT_IS_DOUBLE
+      _panVertical = (fabs(velocity.y) > fabs(velocity.x));
+#else
+      _panVertical = (fabsf(velocity.y) > fabsf(velocity.x));
+#endif
 
     if (_panVertical) {
       _panStartValue = _shimmeringView.shimmeringSpeed;

diff --git a/FBShimmering/FBShimmering.h b/FBShimmering/FBShimmering.h
@@ -20,7 +20,7 @@ typedef NS_ENUM(NSInteger, FBShimmerDirection) {
 @protocol FBShimmering <NSObject>
 
 //! @abstract Set this to YES to start shimming and NO to stop. Defaults to NO.
-@property (nonatomic, assign, readwrite, getter = isShimmering) BOOL shimmering;
+@property (assign, nonatomic, readwrite, getter = isShimmering) BOOL shimmering;
 
 //! @abstract The time interval between shimmerings in seconds. Defaults to 0.4.
 @property (assign, nonatomic, readwrite) CFTimeInterval shimmeringPauseDuration;