From 72b66387d044c869bc68878c13dec142886525b9 Mon Sep 17 00:00:00 2001 From: Samuel Hsiung Date: Tue, 30 Aug 2016 10:49:29 -0700 Subject: [PATCH] make inline functions in ASDisplayNodeExtras.h static (#2167) * make inline functions in ASDisplayNodeExtras.h static to fix linker errors * use `ASDISPLAYNODE_INLINE` in place of `static inline` --- AsyncDisplayKit/ASDisplayNodeExtras.h | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/AsyncDisplayKit/ASDisplayNodeExtras.h b/AsyncDisplayKit/ASDisplayNodeExtras.h index a0702a5bc6..c5c965bd1d 100644 --- a/AsyncDisplayKit/ASDisplayNodeExtras.h +++ b/AsyncDisplayKit/ASDisplayNodeExtras.h @@ -16,27 +16,27 @@ // Because inline methods can't be extern'd and need to be part of the translation unit of code // that compiles with them to actually inline, we both declare and define these in the header. -inline BOOL ASInterfaceStateIncludesVisible(ASInterfaceState interfaceState) +ASDISPLAYNODE_INLINE BOOL ASInterfaceStateIncludesVisible(ASInterfaceState interfaceState) { return ((interfaceState & ASInterfaceStateVisible) == ASInterfaceStateVisible); } -inline BOOL ASInterfaceStateIncludesDisplay(ASInterfaceState interfaceState) +ASDISPLAYNODE_INLINE BOOL ASInterfaceStateIncludesDisplay(ASInterfaceState interfaceState) { return ((interfaceState & ASInterfaceStateDisplay) == ASInterfaceStateDisplay); } -inline BOOL ASInterfaceStateIncludesFetchData(ASInterfaceState interfaceState) +ASDISPLAYNODE_INLINE BOOL ASInterfaceStateIncludesFetchData(ASInterfaceState interfaceState) { return ((interfaceState & ASInterfaceStateFetchData) == ASInterfaceStateFetchData); } -inline BOOL ASInterfaceStateIncludesMeasureLayout(ASInterfaceState interfaceState) +ASDISPLAYNODE_INLINE BOOL ASInterfaceStateIncludesMeasureLayout(ASInterfaceState interfaceState) { return ((interfaceState & ASInterfaceStateMeasureLayout) == ASInterfaceStateMeasureLayout); } -inline NSString * _Nonnull NSStringFromASInterfaceState(ASInterfaceState interfaceState) +ASDISPLAYNODE_INLINE NSString * _Nonnull NSStringFromASInterfaceState(ASInterfaceState interfaceState) { NSMutableArray *states = [NSMutableArray array]; if (interfaceState == ASInterfaceStateNone) {