gnustep/libs-base
0
0
Fork 0
mirror of https://github.com/gnustep/libs-base.git synced 2025-04-22 16:33:29 +00:00
Code Issues Projects Releases Packages Wiki Activity

Remove errors and warnings.

Browse source
This commit is contained in:
Gregory John Casamento 2019-05-27 07:40:18 -04:00
parent 90efc7017a
commit 2b7152fcde
2 changed files with 100 additions and 35 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
Headers/Foundation/NSOrderedSet.h
View file

@ -67,8 +67,6 @@ extern "C" {
+ (instancetype) orderedSetWithObjects:(const GS_GENERIC_TYPE(ElementT)[])objects
count:(NSUInteger) count;
+ (instancetype) orderedSetWithOrderedSet:(GS_GENERIC_CLASS(NSOrderedSet, ElementT)*)aSet;
+ (instancetype) orderedSetWithOrderedSet:(GS_GENERIC_CLASS(NSOrderedSet, ElementT)*)aSet
count:(NSUInteger) count;
+ (instancetype) orderedSetWithSet:(GS_GENERIC_CLASS(NSSet, ElementT)*)aSet;
+ (instancetype) orderedSetWithSet:(GS_GENERIC_CLASS(NSSet, ElementT)*)aSet
copyItems:(BOOL)flag;
@ -146,9 +144,9 @@ extern "C" {
// Set operations
- (BOOL) intersectsOrderedSet: (NSOrderedSet *)aSet;
- (BOOL) intersectsSet: (NSOrderedSet *)aSet;
- (BOOL) intersectsSet: (NSSet *)aSet;
- (BOOL) isSubsetOfOrderedSet: (NSOrderedSet *)aSet;
- (BOOL) isSubsetOfSet:(NSOrderedSet *)aSet;
- (BOOL) isSubsetOfSet:(NSSet *)aSet;
// Creating a Sorted Array
- (GS_GENERIC_CLASS(NSArray, ElementT) *) sortedArrayUsingDescriptors:(NSArray *)sortDescriptors;

129
Source/NSOrderedSet.m
View file

@ -270,16 +270,9 @@ static Class NSMutableOrderedSet_concrete_class;
+ (instancetype) orderedSetWithOrderedSet:(NSOrderedSet *)aSet
{
return AUTORELEASE([[self allocWithZone: NSDefaultMallocZone()]
initWithSet: aSet]);
initWithOrderedSet: aSet]);
}
+ (instancetype) orderedSetWithOrderedSet:(NSOrderedSet *)aSet
count:(NSUInteger) count
{
return AUTORELEASE([[self allocWithZone: NSDefaultMallocZone()]
initWithSet: aSet
count: count]);
}
+ (instancetype) orderedSetWithSet:(NSSet *)aSet
{
@ -290,9 +283,9 @@ static Class NSMutableOrderedSet_concrete_class;
+ (instancetype) orderedSetWithSet:(NSSet *)aSet
copyItems:(BOOL)flag
{
return AUTORELEASE([[self allocWithZone: NSDefaultMallocZone()]
initWithOrderedSet: aSet
copyItems: flag]);
return AUTORELEASE([[self allocWithZone: NSDefaultMallocZone()]
initWithSet: aSet
copyItems: flag]);
}
// instance methods
@ -331,42 +324,110 @@ static Class NSMutableOrderedSet_concrete_class;
- (instancetype) initWithArray:(NSArray *)other copyItems:(BOOL)flag
{
return nil;
unsigned count = [other count];
if (count == 0)
{
return [self init];
}
else
{
GS_BEGINIDBUF(objs, count);
if ([other isProxy])
{
unsigned i;
for (i = 0; i < count; i++)
{
objs[i] = [other objectAtIndex: i];
}
}
else
{
[other getObjects: objs];
}
self = [self initWithObjects: objs count: count];
GS_ENDIDBUF();
return self;
}
}
- (instancetype) initWithArray:(NSArray *)other
range:(NSRange)range
copyItems:(BOOL)flag
{
return nil;
unsigned count = [other count];
if (count == 0)
{
return [self init];
}
else
{
GS_BEGINIDBUF(objs, count);
if ([other isProxy])
{
unsigned i = 0;
unsigned loc = range.location;
unsigned len = range.length;
unsigned j = 0;
for (i = 0; i < count; i++)
{
if(i >= loc && j < len)
{
if(flag == YES)
{
objs[i] = [[other objectAtIndex: i] copy];
}
else
{
objs[i] = [other objectAtIndex: i];
}
j++;
}
if(j >= len)
{
break;
}
}
}
else
{
[other getObjects: objs];
}
self = [self initWithObjects: objs count: count];
GS_ENDIDBUF();
return self;
}
}
- (instancetype) initWithObject:(id)object
{
return nil;
}
- (instancetype) initWithObjects:(id)firstObject, ...
{
id set;
GS_USEIDLIST(firstObject,
set = [[self allocWithZone: NSDefaultMallocZone()]
initWithObjects: __objects count: __count]);
return AUTORELEASE(set);
self = [self initWithObjects: __objects count: __count]);
return self;
}
/** <init /> <override-subclass />
* Initialize to contain (unique elements of) objects.<br />
* Calls -init (which does nothing but maintain MacOS-X compatibility),
* and needs to be re-implemented in subclasses in order to have all
* other initialisers work.
*/
- (instancetype) initWithObjects:(const id [])objects
count:(NSUInteger)count
{
self = [self initWithCapacity: count];
if (self != nil)
{
while (count--)
{
[self addObject: objects[count]];
}
}
self = [self init];
return self;
}
@ -425,7 +486,13 @@ static Class NSMutableOrderedSet_concrete_class;
j++;
}
i++;
if(j >= len)
{
break;
}
}
self = [self initWithObjects: os count: c];
if (flag)
{
@ -692,7 +759,7 @@ static Class NSMutableOrderedSet_concrete_class;
return NO;
}
- (BOOL) intersectsSet: (NSOrderedSet *)aSet
- (BOOL) intersectsSet: (NSSet *)aSet
{
return NO;
}
@ -702,7 +769,7 @@ static Class NSMutableOrderedSet_concrete_class;
return NO;
}
- (BOOL) isSubsetOfSet:(NSOrderedSet *)aSet
- (BOOL) isSubsetOfSet:(NSSet *)aSet
{
return NO;
}
@ -879,7 +946,7 @@ static Class NSMutableOrderedSet_concrete_class;
{
}
- (void) intersectSet:(NSOrderedSet *)aSet
- (void) intersectSet:(NSSet *)aSet
{
}
@ -887,7 +954,7 @@ static Class NSMutableOrderedSet_concrete_class;
{
}
- (void) minusSet:(NSOrderedSet *)aSet
- (void) minusSet:(NSSet *)aSet
{
}
@ -895,7 +962,7 @@ static Class NSMutableOrderedSet_concrete_class;
{
}
- (void) unionSet:(NSOrderedSet *)aSet
- (void) unionSet:(NSSet *)aSet
{
}