fix some return type errors

git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/base/trunk@31338 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Richard Frith-MacDonald 2010-09-12 17:05:30 +00:00
parent 8b838e67e1
commit a4f869f7e5
11 changed files with 34 additions and 20 deletions

View file

@ -1,3 +1,17 @@
2010-09-12 Richard Frith-Macdonald <rfm@gnu.org>
* Source/GSConcreteValueTemplate.m:
* Source/NSSocketPort.m:
* Source/NSSortDescriptor.m:
* Source/NSMessagePort.m:
* Source/GSAttributedString.m:
* Source/NSNumber.m:
* Source/GSString.m:
* Source/NSHost.m:
* Source/NSDate.m:
* Source/GSValue.m:
Fix return types.
2010-09-10 Richard Frith-Macdonald <rfm@gnu.org>
* Source/NSSocketPort.m:

View file

@ -512,7 +512,7 @@ _attributesAtIndexEffectiveRange(
// The superclass implementation is correct but too slow
- (unsigned int) length
- (NSUInteger) length
{
return [_textChars length];
}
@ -901,7 +901,7 @@ SANITY();
}
// The superclass implementation is correct but too slow
- (unsigned int) length
- (NSUInteger) length
{
return [_textChars length];
}

View file

@ -191,7 +191,7 @@
double d;
unsigned char c[sizeof(double)];
} val;
unsigned hash = 0;
NSUInteger hash = 0;
unsigned int i;
val.d = data.x + data.y;
@ -207,7 +207,7 @@
double d;
unsigned char c[sizeof(double)];
} val;
unsigned hash = 0;
NSUInteger hash = 0;
unsigned int i;
val.d = data.origin.x + data.origin.y + data.size.width + data.size.height;
@ -219,7 +219,7 @@
double d;
unsigned char c[sizeof(double)];
} val;
unsigned hash = 0;
NSUInteger hash = 0;
unsigned int i;
val.d = data.width + data.height;

View file

@ -237,7 +237,7 @@ static BOOL (*convertImp)(id, SEL, NSStringEncoding);
static SEL equalSel;
static BOOL (*equalImp)(id, SEL, id);
static SEL hashSel;
static unsigned (*hashImp)(id, SEL);
static NSUInteger (*hashImp)(id, SEL);
static NSStringEncoding externalEncoding = 0;
static NSStringEncoding internalEncoding = NSISOLatin1StringEncoding;
@ -3121,7 +3121,7 @@ transmute(GSStr self, NSString *aString)
getCString_c((GSStr)self, buffer, maxLength, aRange, leftoverRange);
}
- (NSInteger) intValue
- (int) intValue
{
return intValue_c((GSStr)self);
}
@ -3221,7 +3221,7 @@ transmute(GSStr self, NSString *aString)
}
// private method for Unicode level 3 implementation
- (NSInteger) _baseLength
- (int) _baseLength
{
return _count;
}
@ -3437,7 +3437,7 @@ agree, create a new GSCInlineString otherwise.
getCString_u((GSStr)self, buffer, maxLength, aRange, leftoverRange);
}
- (NSInteger) intValue
- (int) intValue
{
return intValue_u((GSStr)self);
}
@ -3537,7 +3537,7 @@ agree, create a new GSCInlineString otherwise.
}
// private method for Unicode level 3 implementation
- (NSInteger) _baseLength
- (int) _baseLength
{
unsigned int count = 0;
unsigned int blen = 0;
@ -4183,7 +4183,7 @@ NSAssert(_flags.owned == 1 && _zone != 0, NSInternalInconsistencyException);
return self;
}
- (NSInteger) intValue
- (int) intValue
{
if (_flags.wide == 1)
return intValue_u((GSStr)self);
@ -4584,7 +4584,7 @@ NSAssert(_flags.owned == 1 && _zone != 0, NSInternalInconsistencyException);
}
// private method for Unicode level 3 implementation
- (NSInteger) _baseLength
- (int) _baseLength
{
if (_flags.wide == 1)
{

View file

@ -133,7 +133,7 @@ typeSize(const char* type)
}
}
- (unsigned) hash
- (NSUInteger) hash
{
unsigned size = typeSize(objctype);
unsigned hash = 0;

View file

@ -1304,7 +1304,7 @@ otherTime(NSDate* other)
return self;
}
- (unsigned) hash
- (NSUInteger) hash
{
return (unsigned)[self timeIntervalSinceReferenceDate];
}
@ -1460,7 +1460,7 @@ otherTime(NSDate* other)
return self;
}
- (unsigned) hash
- (NSUInteger) hash
{
return (unsigned)_seconds_since_ref;
}

View file

@ -533,7 +533,7 @@ myHostName()
* is for all hosts to hash to the same value - which makes it very
* inefficient to store them in a set, dictionary, map or hash table.
*/
- (unsigned) hash
- (NSUInteger) hash
{
return 1;
}

View file

@ -1564,7 +1564,7 @@ typedef struct {
[d handlePortMessage: m];
}
- (unsigned) hash
- (NSUInteger) hash
{
return [name hash];
}

View file

@ -389,7 +389,7 @@ static NSBoolNumber *boolN; // Boolean NO (integer 0)
return NO;
}
- (unsigned) hash
- (NSUInteger) hash
{
return (unsigned)[self doubleValue];
}

View file

@ -2030,7 +2030,7 @@ static Class tcpPortClass;
[d handlePortMessage: m];
}
- (unsigned) hash
- (NSUInteger) hash
{
return (unsigned)portNum;
}

View file

@ -82,7 +82,7 @@
[super dealloc];
}
- (unsigned) hash
- (NSUInteger) hash
{
const char *sel = sel_getName(_selector);