From e2c5fe29fe7277d5895c948cebcb93b09a3f160a Mon Sep 17 00:00:00 2001 From: theraven Date: Sun, 31 Jul 2011 18:34:40 +0000 Subject: [PATCH] More ARC fixups: id* -> const id* in NSSet git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/base/trunk@33666 72102866-910b-0410-8b05-ffd578937521 --- Headers/Foundation/NSSet.h | 4 ++-- Source/GSCountedSet.m | 2 +- Source/GSSet.m | 4 ++-- Source/NSSet.m | 6 +++--- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/Headers/Foundation/NSSet.h b/Headers/Foundation/NSSet.h index 4227ba5fc..f4d2e4126 100644 --- a/Headers/Foundation/NSSet.h +++ b/Headers/Foundation/NSSet.h @@ -47,7 +47,7 @@ extern "C" { + (id) setWithObject: (id)anObject; + (id) setWithObjects: (id)firstObject, ...; #if OS_API_VERSION(GS_API_MACOSX, GS_API_LATEST) -+ (id) setWithObjects: (id*)objects ++ (id) setWithObjects: (const id*)objects count: (NSUInteger)count; #endif + (id) setWithSet: (NSSet*)aSet; @@ -62,7 +62,7 @@ extern "C" { - (id) init; - (id) initWithArray: (NSArray*)other; - (id) initWithObjects: (id)firstObject, ...; -- (id) initWithObjects: (id*)objects +- (id) initWithObjects: (const id*)objects count: (NSUInteger)count; - (id) initWithSet: (NSSet*)other; - (id) initWithSet: (NSSet*)other copyItems: (BOOL)flag; diff --git a/Source/GSCountedSet.m b/Source/GSCountedSet.m index 6efbf6bd7..13375de1e 100644 --- a/Source/GSCountedSet.m +++ b/Source/GSCountedSet.m @@ -227,7 +227,7 @@ static GC_descr nodeDesc; // Type descriptor for map node. return self; } -- (id) initWithObjects: (id*)objs count: (NSUInteger)c +- (id) initWithObjects: (const id*)objs count: (NSUInteger)c { NSUInteger i; diff --git a/Source/GSSet.m b/Source/GSSet.m index d528cad9a..65a7a3d82 100644 --- a/Source/GSSet.m +++ b/Source/GSSet.m @@ -252,7 +252,7 @@ static Class mutableSetClass; } /* Designated initialiser */ -- (id) initWithObjects: (id*)objs count: (NSUInteger)c +- (id) initWithObjects: (const id*)objs count: (NSUInteger)c { NSUInteger i; @@ -604,7 +604,7 @@ static Class mutableSetClass; return self; } -- (id) initWithObjects: (id*)objects +- (id) initWithObjects: (const id*)objects count: (NSUInteger)count { self = [self initWithCapacity: count]; diff --git a/Source/NSSet.m b/Source/NSSet.m index 7327c778d..8c98f7a46 100644 --- a/Source/NSSet.m +++ b/Source/NSSet.m @@ -110,7 +110,7 @@ static Class NSMutableSet_concrete_class; /** * New set containing (unique elements of) objects. */ -+ (id) setWithObjects: (id*)objects ++ (id) setWithObjects: (const id*)objects count: (NSUInteger)count { return AUTORELEASE([[self allocWithZone: NSDefaultMallocZone()] @@ -314,7 +314,7 @@ static Class NSMutableSet_concrete_class; * and needs to be re-implemented in subclasses in order to have all * other initialisers work. */ -- (id) initWithObjects: (id*)objects +- (id) initWithObjects: (const id*)objects count: (NSUInteger)count { self = [self init]; @@ -1005,7 +1005,7 @@ static Class NSMutableSet_concrete_class; [self subclassResponsibility: _cmd]; } -- (id) initWithObjects: (id*)objects +- (id) initWithObjects: (const id*)objects count: (NSUInteger)count { self = [self initWithCapacity: count];