64bit fixups

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

View file

@ -58,7 +58,7 @@ static Class gcClass = 0;
{
GCArray *result;
id *objects;
unsigned i, c = [self count];
NSUInteger i, c = [self count];
if (NSShouldRetainWithZone(self, zone))
{
@ -248,7 +248,7 @@ static Class gcClass = 0;
{
GCArray *result;
id *objects;
unsigned i, c = [self count];
NSUInteger i, c = [self count];
objects = NSZoneMalloc(zone, c * sizeof(id));
/* FIXME: Check if malloc return 0 */
@ -342,7 +342,7 @@ static Class gcClass = 0;
if (_count == _maxCount)
{
unsigned old = _maxCount;
NSUInteger old = _maxCount;
BOOL *optr;
if (_maxCount > 0)

View file

@ -38,12 +38,12 @@
*/
- (id) initWithArray: (NSArray*)array copyItems: (BOOL)shouldCopy
{
unsigned c = [array count];
NSUInteger c = [array count];
GS_BEGINIDBUF(objects, c);
if ([array isProxy])
{
unsigned i;
NSUInteger i;
for (i = 0; i < c; i++)
{
@ -56,7 +56,7 @@
}
if (shouldCopy == YES)
{
unsigned i;
NSUInteger i;
for (i = 0; i < c; i++)
{
@ -79,13 +79,13 @@
}
- (NSUInteger) insertionPosition: (id)item
usingFunction: (NSComparisonResult (*)(id, id, void *))sorter
context: (void *)context
usingFunction: (NSComparisonResult (*)(id, id, void *))sorter
context: (void *)context
{
unsigned count = [self count];
unsigned upper = count;
unsigned lower = 0;
unsigned index;
NSUInteger count = [self count];
NSUInteger upper = count;
NSUInteger lower = 0;
NSUInteger index;
SEL oaiSel;
IMP oai;
@ -136,12 +136,12 @@
}
- (NSUInteger) insertionPosition: (id)item
usingSelector: (SEL)comp
usingSelector: (SEL)comp
{
unsigned count = [self count];
unsigned upper = count;
unsigned lower = 0;
unsigned index;
NSUInteger count = [self count];
NSUInteger upper = count;
NSUInteger lower = 0;
NSUInteger index;
NSComparisonResult (*imp)(id, SEL, id);
SEL oaiSel;
IMP oai;