diff --git a/Source/Layout/ASLayout.h b/Source/Layout/ASLayout.h index 1a867c733..886756bb4 100644 --- a/Source/Layout/ASLayout.h +++ b/Source/Layout/ASLayout.h @@ -130,16 +130,14 @@ AS_EXTERN ASLayout *ASCalculateLayout(idlayoutElement, const AS */ + (instancetype)layoutWithLayoutElement:(id)layoutElement size:(CGSize)size NS_RETURNS_RETAINED AS_WARN_UNUSED_RESULT; + /** * Traverses the existing layout tree and generates a new tree that represents only ASDisplayNode layouts */ - (ASLayout *)filteredNodeLayoutTree NS_RETURNS_RETAINED AS_WARN_UNUSED_RESULT; -@end - -@interface ASLayout (Unavailable) - - (instancetype)init NS_UNAVAILABLE; +- (instancetype)new NS_UNAVAILABLE; @end diff --git a/Source/Private/ASLayoutTransition.h b/Source/Private/ASLayoutTransition.h index 1060a57d8..91007800d 100644 --- a/Source/Private/ASLayoutTransition.h +++ b/Source/Private/ASLayoutTransition.h @@ -95,11 +95,8 @@ AS_SUBCLASSING_RESTRICTED */ - (void)applySubnodeRemovals; -@end - -@interface ASLayoutTransition (Unavailable) - -- (instancetype)init __unavailable; +- (instancetype)init NS_UNAVAILABLE; +- (instancetype)new NS_UNAVAILABLE; @end diff --git a/Source/Private/ASLayoutTransition.mm b/Source/Private/ASLayoutTransition.mm index 77a8fdd7c..4dcfb3757 100644 --- a/Source/Private/ASLayoutTransition.mm +++ b/Source/Private/ASLayoutTransition.mm @@ -85,12 +85,6 @@ - (instancetype)initWithNode:(ASDisplayNode *)node return self; } -- (instancetype)init -{ - ASDisplayNodeAssert(NO, @"Use the designated initializer"); - return [self init]; -} - - (BOOL)isSynchronous { ASDN::MutexSharedLocker l(__instanceLock__);