From 60a0f7ce5be681009dd16d1e43cb278e5d6f63b6 Mon Sep 17 00:00:00 2001
From: Richard Frith-MacDonald <rfm@gnu.org>
Date: Fri, 16 Jan 2015 15:25:50 +0000
Subject: [PATCH] minor fixes for 64bit systems using collection with more than
 2^32 items

git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/base/trunk@38295 72102866-910b-0410-8b05-ffd578937521
---
 Source/GSArray.m         | 8 ++++----
 Source/NSArray.m         | 8 ++++----
 Source/NSKeyedArchiver.m | 4 ++--
 Source/NSPointerArray.m  | 4 ++--
 Source/NSPredicate.m     | 4 ++--
 Source/NSSet.m           | 4 ++--
 6 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/Source/GSArray.m b/Source/GSArray.m
index b485452d5..f8a4e38d7 100644
--- a/Source/GSArray.m
+++ b/Source/GSArray.m
@@ -84,8 +84,8 @@ static Class	GSInlineArrayClass;
   NSString     *reason;
 
   info = [NSDictionary dictionaryWithObjectsAndKeys:
-    [NSNumber numberWithUnsignedInt: index], @"Index",
-    [NSNumber numberWithUnsignedInt: _count], @"Count",
+    [NSNumber numberWithUnsignedInteger: index], @"Index",
+    [NSNumber numberWithUnsignedInteger: _count], @"Count",
     self, @"Array", nil, nil];
 
   reason = [NSString stringWithFormat:
@@ -591,7 +591,7 @@ static Class	GSInlineArrayClass;
       NSDictionary *info;
 
       info = [NSDictionary dictionaryWithObjectsAndKeys:
-	[NSNumber numberWithUnsignedInt: index], @"Index",
+	[NSNumber numberWithUnsignedInteger: index], @"Index",
 	self, @"Array", nil, nil];
 
       exception = [NSException exceptionWithName: NSInvalidArgumentException
@@ -772,7 +772,7 @@ static Class	GSInlineArrayClass;
       NSDictionary *info;
 
       info = [NSDictionary dictionaryWithObjectsAndKeys:
-	[NSNumber numberWithUnsignedInt: index], @"Index",
+	[NSNumber numberWithUnsignedInteger: index], @"Index",
         _contents_array[index], @"OldObject",
 	self, @"Array", nil, nil];
 
diff --git a/Source/NSArray.m b/Source/NSArray.m
index 1a35a98de..7a23090da 100644
--- a/Source/NSArray.m
+++ b/Source/NSArray.m
@@ -1463,13 +1463,13 @@ compare(id elem1, id elem2, void* context)
 
   if ([key isEqualToString: @"@count"] == YES)
     {
-      result = [NSNumber numberWithUnsignedInt: [self count]];
+      result = [NSNumber numberWithUnsignedInteger: [self count]];
     }
   else if ([key isEqualToString: @"count"] == YES)
     {
       GSOnceMLog(
 @"[NSArray-valueForKey:] called wth 'count' is deprecated .. use '@count'");
-      result = [NSNumber numberWithUnsignedInt: [self count]];
+      result = [NSNumber numberWithUnsignedInteger: [self count]];
     }
   else
     {
@@ -1517,7 +1517,7 @@ compare(id elem1, id elem2, void* context)
         {
           if ([path isEqualToString: @"@count"] == YES)
             {
-              result = [NSNumber numberWithUnsignedInt: [self count]];
+              result = [NSNumber numberWithUnsignedInteger: [self count]];
             }
           else
             {
@@ -1532,7 +1532,7 @@ compare(id elem1, id elem2, void* context)
 
           if ([op isEqualToString: @"@count"] == YES)
             {
-              result = [NSNumber numberWithUnsignedInt: count];
+              result = [NSNumber numberWithUnsignedInteger: count];
             }
           else if ([op isEqualToString: @"@avg"] == YES)
             {
diff --git a/Source/NSKeyedArchiver.m b/Source/NSKeyedArchiver.m
index de589d26a..eff6845d4 100644
--- a/Source/NSKeyedArchiver.m
+++ b/Source/NSKeyedArchiver.m
@@ -752,12 +752,12 @@ static NSDictionary *makeReference(unsigned ref)
 	return;
 
       case _C_INT:
-	o = [NSNumber numberWithInt: *(NSInteger*)address];
+	o = [NSNumber numberWithInt: *(int*)address];
 	[_enc setObject: o forKey: aKey];
 	return;
 
       case _C_UINT:
-	o = [NSNumber numberWithUnsignedInt: *(NSUInteger*)address];
+	o = [NSNumber numberWithUnsignedInt: *(unsigned int*)address];
 	[_enc setObject: o forKey: aKey];
 	return;
 
diff --git a/Source/NSPointerArray.m b/Source/NSPointerArray.m
index 5e3298cc0..c1584cd07 100644
--- a/Source/NSPointerArray.m
+++ b/Source/NSPointerArray.m
@@ -229,8 +229,8 @@ static Class	concreteClass = Nil;
   NSString     *reason;
 
   info = [NSDictionary dictionaryWithObjectsAndKeys:
-    [NSNumber numberWithUnsignedInt: index], @"Index",
-    [NSNumber numberWithUnsignedInt: _count], @"Count",
+    [NSNumber numberWithUnsignedInteger: index], @"Index",
+    [NSNumber numberWithUnsignedInteger: _count], @"Count",
     self, @"Array", nil, nil];
 
   reason = [NSString stringWithFormat:
diff --git a/Source/NSPredicate.m b/Source/NSPredicate.m
index 2c51caa66..234a9c72c 100644
--- a/Source/NSPredicate.m
+++ b/Source/NSPredicate.m
@@ -213,7 +213,7 @@ extern void     GSPropertyListMake(id,NSDictionary*,BOOL,BOOL,unsigned,id*);
               case 'i':
                 ptr++;
                 [arr addObject: [NSNumber numberWithInt:
-                  va_arg(args, NSInteger)]];
+                  va_arg(args, int)]];
                 break;
 
               case 'o':
@@ -224,7 +224,7 @@ extern void     GSPropertyListMake(id,NSDictionary*,BOOL,BOOL,unsigned,id*);
               case 'X':
                 ptr++;
                 [arr addObject: [NSNumber numberWithUnsignedInt:
-                  va_arg(args, NSUInteger)]];
+                  va_arg(args, unsigned)]];
                 break;
 
               case 'e':
diff --git a/Source/NSSet.m b/Source/NSSet.m
index 40f90eb67..8422ddac8 100644
--- a/Source/NSSet.m
+++ b/Source/NSSet.m
@@ -656,7 +656,7 @@ static Class NSMutableSet_concrete_class;
         {
           if ([path isEqualToString: @"@count"] == YES)
             {
-              result = [NSNumber numberWithUnsignedInt: [self count]];
+              result = [NSNumber numberWithUnsignedInteger: [self count]];
             }
           else
             {
@@ -671,7 +671,7 @@ static Class NSMutableSet_concrete_class;
 
           if ([op isEqualToString: @"@count"] == YES)
             {
-              result = [NSNumber numberWithUnsignedInt: count];
+              result = [NSNumber numberWithUnsignedInteger: count];
             }
           else if ([op isEqualToString: @"@avg"] == YES)
             {