gnustep/libs-gdl2
0
0
Fork 0
mirror of https://github.com/gnustep/libs-gdl2.git synced 2025-02-16 08:20:59 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

* EOControl/EOFault.h

Browse source 
* EOControl/EOFaultHandler.m
unsigned -> NSUInteger
* EOControl/EOFault.m
unsigned -> NSUInteger
-release
fix as suggested by David Ayers
-dealloc
add NSAssert



git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gdl2/trunk@30889 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Dave Wetzel 2010-06-29 08:27:13 +00:00
parent 7c14405e1d
commit e954a305bd
4 changed files with 27 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
ChangeLog
View file

@ -1,3 +1,14 @@
2010-06-29 David Wetzel <dave@turbocat.de>
* EOControl/EOFault.h
* EOControl/EOFaultHandler.m
unsigned -> NSUInteger
* EOControl/EOFault.m
unsigned -> NSUInteger
-release
fix as suggested by David Ayers
-dealloc
add NSAssert
2010-06-28 David Wetzel <dave@turbocat.de>
* EOAccess/EODatabaseContext.m
-initializeObject:withGlobalID:editingContext:

8
EOControl/EOFault.h
View file

@ -98,10 +98,10 @@
- (NSUInteger)retainCount;
- (NSString *)description;
- (NSString *)descriptionWithIndent: (unsigned)level;
- (NSString *)descriptionWithIndent: (NSUInteger)level;
- (NSString *)descriptionWithLocale: (NSDictionary *)locale;
- (NSString *)descriptionWithLocale: (NSDictionary *)locale
indent: (unsigned)level;
indent: (NSUInteger)level;
- (NSString *)eoDescription;
- (NSString *)eoShallowDescription;
@ -126,7 +126,7 @@
void *_extraData; /* Cached memory contents of original object
overwritten by fault handler reference. */
unsigned _extraRefCount;
NSUInteger _extraRefCount;
}
- (void)setTargetClass: (Class)target extraData: (void *)data;
@ -135,7 +135,7 @@
- (void)incrementExtraRefCount;
- (BOOL)decrementExtraRefCountIsZero;
- (unsigned)extraRefCount;
- (NSUInteger)extraRefCount;
- (NSString *)descriptionForObject: (id)object;

21
EOControl/EOFault.m
View file

@ -169,7 +169,7 @@ static Class EOFaultClass = NULL;
if (object)
{
EOFault *fault = object;
unsigned int refs;
NSUInteger refs;
NSAssert(handler, @"No Handler");
@ -318,10 +318,10 @@ static Class EOFaultClass = NULL;
- (void)release
{
if ([_handler extraRefCount] <= 0)
if ([_handler decrementExtraRefCountIsZero])
{
[self dealloc];
else
[_handler decrementExtraRefCountIsZero];
}
}
- autorelease
@ -341,7 +341,7 @@ static Class EOFaultClass = NULL;
return [_handler descriptionForObject: self];
}
- (NSString *)descriptionWithIndent: (unsigned)level
- (NSString *)descriptionWithIndent: (NSUInteger)level
{
return [self description];
}
@ -353,7 +353,7 @@ static Class EOFaultClass = NULL;
}
- (NSString *)descriptionWithLocale: (NSDictionary *)locale
indent: (unsigned)level
indent: (NSUInteger)level
{
return [self description];
}
@ -392,8 +392,9 @@ static Class EOFaultClass = NULL;
- (void)dealloc
{
[EOFaultClass clearFault: self];
if (![EOFaultClass isFault:self]) // otherwise, this loop.
[self dealloc];
NSAssert([EOFaultClass isFault:self]==NO, @"Object is a Fault not an EO");
[self dealloc];
}
- (NSZone *)zone
@ -435,9 +436,9 @@ static Class EOFaultClass = NULL;
[invocation invoke];
}
- (unsigned int)hash
- (NSUInteger)hash
{
unsigned int hash;
NSUInteger hash;
EOFaultHandler *handler;
Class fault;

2
EOControl/EOFaultHandler.m
View file

@ -101,7 +101,7 @@ RCS_ID("$Id$")
return NO;
}
- (unsigned)extraRefCount
- (NSUInteger)extraRefCount
{
return _extraRefCount;
}