gnustep/libs-base
0
0
Fork 0
mirror of https://github.com/gnustep/libs-base.git synced 2025-05-31 00:30:53 +00:00
Code Issues Projects Releases Packages Wiki Activity

64bit fixups

Browse source 
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/base/trunk@29872 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
rfm 2010-03-08 07:06:47 +00:00
parent 9057529378
commit ea2ee9cea6
8 changed files with 105 additions and 78 deletions
Download patch file Download diff file Expand all files Collapse all files

12
Source/GSSet.m
View file

@ -135,7 +135,7 @@ static Class mutableSetClass;
{
GSIMapEnumerator_t enumerator = GSIMapEnumeratorForMap(&map);
GSIMapNode node = GSIMapEnumeratorNextNode(&enumerator);
unsigned i = 0;
NSUInteger i = 0;
NSArray *result;
GS_BEGINIDBUF(objects, map.nodeCount);
@ -199,13 +199,13 @@ static Class mutableSetClass;
}
else
{
unsigned count = map.nodeCount;
NSUInteger count = map.nodeCount;
SEL sel = @selector(encodeObject:);
IMP imp = [aCoder methodForSelector: sel];
GSIMapEnumerator_t enumerator = GSIMapEnumeratorForMap(&map);
GSIMapNode node = GSIMapEnumeratorNextNode(&enumerator);
[aCoder encodeValueOfObjCType: @encode(unsigned) at: &count];
[aCoder encodeValueOfObjCType: @encode(NSUInteger) at: &count];
while (node != 0)
{
(*imp)(aCoder, sel, node->key.obj);
@ -233,13 +233,13 @@ static Class mutableSetClass;
}
else
{
unsigned count;
NSUInteger count;
id value;
SEL sel = @selector(decodeValueOfObjCType:at:);
IMP imp = [aCoder methodForSelector: sel];
const char *type = @encode(id);
(*imp)(aCoder, sel, @encode(unsigned), &count);
(*imp)(aCoder, sel, @encode(NSUInteger), &count);
GSIMapInitWithZoneAndCapacity(&map, [self zone], count);
while (count-- > 0)
@ -254,7 +254,7 @@ static Class mutableSetClass;
/* Designated initialiser */
- (id) initWithObjects: (id*)objs count: (NSUInteger)c
{
unsigned i;
NSUInteger i;
GSIMapInitWithZoneAndCapacity(&map, [self zone], c);
for (i = 0; i < c; i++)