Skip to content

Commit

Permalink
Do not expose tgmath.h to all clients of Texture (#1900)
Browse files Browse the repository at this point in the history
* Do not expose tgmath.h to all clients of Texture

- tgmath.h #undef the `log` macro for mathematical reasons. Code that may also use a log name (such as CocoaLumberjack) will get confused by this when they try to use `NS_SWIFT_NAME` with `log` as part of the name.
- `ABS` from NSObjCRuntime.h is what is typically used for abs on `CGFloat`.
- Note: removing tgmath.h from the Texture umbrella header may expose clients that implicitly depended upon it being imported. Sources may have to be updated after this to `#import <tgmath.h>` explicitly.
  • Loading branch information
Greg Bolsinga committed Aug 21, 2020
1 parent d608bb9 commit 45c0f19
Showing 1 changed file with 1 addition and 4 deletions.
5 changes: 1 addition & 4 deletions Source/Details/CoreGraphics+ASConvenience.h
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,7 @@
//

#import <Foundation/Foundation.h>

#import <CoreGraphics/CoreGraphics.h>
#import <tgmath.h>

#import <AsyncDisplayKit/ASBaseDefines.h>


Expand Down Expand Up @@ -45,7 +42,7 @@ ASDISPLAYNODE_INLINE CGFloat ASCGFloatFromNumber(NSNumber *number)

ASDISPLAYNODE_INLINE BOOL CGSizeEqualToSizeWithIn(CGSize size1, CGSize size2, CGFloat delta)
{
return fabs(size1.width - size2.width) < delta && fabs(size1.height - size2.height) < delta;
return ABS(size1.width - size2.width) < delta && ABS(size1.height - size2.height) < delta;
};

NS_ASSUME_NONNULL_END

0 comments on commit 45c0f19

Please sign in to comment.