fixup return type of sizeInBytes:

git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/sqlclient/trunk@37042 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
rfm 2013-09-05 12:48:53 +00:00
parent 68cf84f1d5
commit 343a0d0fba
3 changed files with 15 additions and 9 deletions

View file

@ -1,3 +1,9 @@
2013-09-05 Richard Frith-Macdonald <rfm@gnu.org>
* SQLClient.h:
* SQLClient.m:
Use NSUInteger for sizeInBytes:
2013-04-10 Richard Frith-Macdonald <rfm@gnu.org>
* ECPG.pgm:

View file

@ -300,7 +300,7 @@ extern NSString * const SQLClientDidDisconnectNotification;
* The exclude set is used to specify objects to exclude from the
* calculation (to prevent recursion etc).
*/
- (unsigned) sizeInBytes: (NSMutableSet*)exclude;
- (NSUInteger) sizeInBytes: (NSMutableSet*)exclude;
@end
extern NSString *SQLException;

View file

@ -519,15 +519,15 @@ static Class rClass = 0;
}
}
- (unsigned) sizeInBytes: (NSMutableSet*)exclude
- (NSUInteger) sizeInBytes: (NSMutableSet*)exclude
{
unsigned size = [super sizeInBytes: exclude];
NSUInteger size = [super sizeInBytes: exclude];
if (size > 0)
{
unsigned pos;
unsigned count = [self count];
id vals[count];
NSUInteger pos;
NSUInteger count = [self count];
id vals[count];
[self getObjects: vals];
for (pos = 0; pos < count; pos++)
@ -768,7 +768,7 @@ static Class rClass = 0;
format: @"Bad key (%@) in -setObject:forKey:", aKey];
}
- (unsigned) sizeInBytes: (NSMutableSet*)exclude
- (NSUInteger) sizeInBytes: (NSMutableSet*)exclude
{
if ([exclude member: self] != nil)
{
@ -776,8 +776,8 @@ static Class rClass = 0;
}
else
{
unsigned size = [super sizeInBytes: exclude];
unsigned pos;
NSUInteger size = [super sizeInBytes: exclude];
NSUInteger pos;
id *ptr;
ptr = ((void*)&count) + sizeof(count);