Move unavailable init into header

TextureGroup · Jul 18, 2018 · 76f1e20 · 76f1e20
1 parent f2d0518
commit 76f1e20
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 21 deletions.
diff --git a/Source/Layout/ASLayout.h b/Source/Layout/ASLayout.h
@@ -130,16 +130,14 @@ AS_EXTERN ASLayout *ASCalculateLayout(id<ASLayoutElement>layoutElement, const AS
  */
 + (instancetype)layoutWithLayoutElement:(id<ASLayoutElement>)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/Layout/ASLayout.mm b/Source/Layout/ASLayout.mm
@@ -134,12 +134,6 @@ - (instancetype)initWithLayoutElement:(id<ASLayoutElement>)layoutElement
   return self;
 }
 
-- (instancetype)init
-{
-  ASDisplayNodeAssert(NO, @"Use the designated initializer");
-  return [self init];
-}
-
 #pragma mark - Class Constructors
 
 + (instancetype)layoutWithLayoutElement:(id<ASLayoutElement>)layoutElement

diff --git 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
@@ -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__);