From 51d97e9d98d529aa4fb5de3a8327152efd3d2408 Mon Sep 17 00:00:00 2001 From: Frederik Seiffert Date: Tue, 9 Jul 2019 17:19:22 +0200 Subject: [PATCH] Fix generics definition of NSMutableArray and NSMutableOrderedSet. The generic element was not passed on to the superclass. --- Headers/Foundation/NSArray.h | 2 +- Headers/Foundation/NSOrderedSet.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Headers/Foundation/NSArray.h b/Headers/Foundation/NSArray.h index 9e8d5d583..2d8af0e1c 100644 --- a/Headers/Foundation/NSArray.h +++ b/Headers/Foundation/NSArray.h @@ -301,7 +301,7 @@ DEFINE_BLOCK_TYPE(GSPredicateBlock, BOOL, GS_GENERIC_TYPE(ElementT), NSUInteger, @end -@interface GS_GENERIC_CLASS(NSMutableArray, ElementT) : NSArray +@interface GS_GENERIC_CLASS(NSMutableArray, ElementT) : GS_GENERIC_CLASS(NSArray, ElementT) + (instancetype) arrayWithCapacity: (NSUInteger)numItems; diff --git a/Headers/Foundation/NSOrderedSet.h b/Headers/Foundation/NSOrderedSet.h index 16b468ff6..749bc1987 100644 --- a/Headers/Foundation/NSOrderedSet.h +++ b/Headers/Foundation/NSOrderedSet.h @@ -159,7 +159,7 @@ extern "C" { @end // Mutable Ordered Set -@interface GS_GENERIC_CLASS(NSMutableOrderedSet, __covariant ElementT) : NSOrderedSet +@interface GS_GENERIC_CLASS(NSMutableOrderedSet, ElementT) : GS_GENERIC_CLASS(NSOrderedSet, ElementT) // Creating a Mutable Ordered Set + (instancetype)orderedSetWithCapacity: (NSUInteger)capacity; - (instancetype)initWithCapacity: (NSUInteger)capacity;