Author: rfm
Date: Fri Jan 16 16:25:50 2015
New Revision: 38295
URL: http://svn.gna.org/viewcvs/gnustep?rev=38295&view=rev
Log:
minor fixes for 64bit systems using collection with more than 2^32 items
Modified:
libs/base/trunk/Source/GSArray.m
libs/base/trunk/Source/NSArray.m
libs/base/trunk/Source/NSKeyedArchiver.m
libs/base/trunk/Source/NSPointerArray.m
libs/base/trunk/Source/NSPredicate.m
libs/base/trunk/Source/NSSet.m
Modified: libs/base/trunk/Source/GSArray.m
URL:
http://svn.gna.org/viewcvs/gnustep/libs/base/trunk/Source/GSArray.m?rev=38295&r1=38294&r2=38295&view=diff
==============================================================================
--- libs/base/trunk/Source/GSArray.m (original)
+++ libs/base/trunk/Source/GSArray.m Fri Jan 16 16:25:50 2015
@@ -84,8 +84,8 @@
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 @@
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 @@
NSDictionary *info;
info = [NSDictionary dictionaryWithObjectsAndKeys:
- [NSNumber numberWithUnsignedInt: index], @"Index",
+ [NSNumber numberWithUnsignedInteger: index], @"Index",
_contents_array[index], @"OldObject",
self, @"Array", nil, nil];
Modified: libs/base/trunk/Source/NSArray.m
URL:
http://svn.gna.org/viewcvs/gnustep/libs/base/trunk/Source/NSArray.m?rev=38295&r1=38294&r2=38295&view=diff
==============================================================================
--- libs/base/trunk/Source/NSArray.m (original)
+++ libs/base/trunk/Source/NSArray.m Fri Jan 16 16:25:50 2015
@@ -1463,13 +1463,13 @@
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 @@
{
if ([path isEqualToString: @"@count"] == YES)
{
- result = [NSNumber numberWithUnsignedInt: [self count]];
+ result = [NSNumber numberWithUnsignedInteger: [self count]];
}
else
{
@@ -1532,7 +1532,7 @@
if ([op isEqualToString: @"@count"] == YES)
{
- result = [NSNumber numberWithUnsignedInt: count];
+ result = [NSNumber numberWithUnsignedInteger: count];
}
else if ([op isEqualToString: @"@avg"] == YES)
{
Modified: libs/base/trunk/Source/NSKeyedArchiver.m
URL:
http://svn.gna.org/viewcvs/gnustep/libs/base/trunk/Source/NSKeyedArchiver.m?rev=38295&r1=38294&r2=38295&view=diff
==============================================================================
--- libs/base/trunk/Source/NSKeyedArchiver.m (original)
+++ libs/base/trunk/Source/NSKeyedArchiver.m Fri Jan 16 16:25:50 2015
@@ -752,12 +752,12 @@
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;
Modified: libs/base/trunk/Source/NSPointerArray.m
URL:
http://svn.gna.org/viewcvs/gnustep/libs/base/trunk/Source/NSPointerArray.m?rev=38295&r1=38294&r2=38295&view=diff
==============================================================================
--- libs/base/trunk/Source/NSPointerArray.m (original)
+++ libs/base/trunk/Source/NSPointerArray.m Fri Jan 16 16:25:50 2015
@@ -229,8 +229,8 @@
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:
Modified: libs/base/trunk/Source/NSPredicate.m
URL:
http://svn.gna.org/viewcvs/gnustep/libs/base/trunk/Source/NSPredicate.m?rev=38295&r1=38294&r2=38295&view=diff
==============================================================================
--- libs/base/trunk/Source/NSPredicate.m (original)
+++ libs/base/trunk/Source/NSPredicate.m Fri Jan 16 16:25:50 2015
@@ -213,7 +213,7 @@
case 'i':
ptr++;
[arr addObject: [NSNumber numberWithInt:
- va_arg(args, NSInteger)]];
+ va_arg(args, int)]];
break;
case 'o':
@@ -224,7 +224,7 @@
case 'X':
ptr++;
[arr addObject: [NSNumber numberWithUnsignedInt:
- va_arg(args, NSUInteger)]];
+ va_arg(args, unsigned)]];
break;
case 'e':
Modified: libs/base/trunk/Source/NSSet.m
URL:
http://svn.gna.org/viewcvs/gnustep/libs/base/trunk/Source/NSSet.m?rev=38295&r1=38294&r2=38295&view=diff
==============================================================================
--- libs/base/trunk/Source/NSSet.m (original)
+++ libs/base/trunk/Source/NSSet.m Fri Jan 16 16:25:50 2015
@@ -656,7 +656,7 @@
{
if ([path isEqualToString: @"@count"] == YES)
{
- result = [NSNumber numberWithUnsignedInt: [self count]];
+ result = [NSNumber numberWithUnsignedInteger: [self count]];
}
else
{
@@ -671,7 +671,7 @@
if ([op isEqualToString: @"@count"] == YES)
{
- result = [NSNumber numberWithUnsignedInt: count];
+ result = [NSNumber numberWithUnsignedInteger: count];
}
else if ([op isEqualToString: @"@avg"] == YES)
{
_______________________________________________
Gnustep-cvs mailing list
[email protected]
https://mail.gna.org/listinfo/gnustep-cvs
