mirror of
https://github.com/gnustep/libs-gdl2.git
synced 2025-02-19 09:40:59 +00:00
* EOControl/EODebug.h: Include missing header for non-*-gnu-*.
* EOAccess/EOAdaptor
([EOAdaptor _performAdministativeStatementsForSelect:
connectionDictionary:administrativeConnectionDictionary]):
Add cast to silence warning.
* EOControl/EOCheapArray.m ([EOCheapArray autorelease]):
Replace objc_thread_id with GSCurrentThread.
([EOCheapArray release]): Ditto.
([EOCheapArray retainCount]): Ditto.
([EOCheapArray retain]): Ditto.
([EOCheapArray dealloc]): Ditto.
([EOCheapArray shallowCopy]): Ditto.
* EOControl/EOFault.m: Include missing header.
([EOFault dealloc]): Replace objc_thread_id with GSCurrentThread.
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gdl2/trunk@18676 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
David Ayers
parent
cedceb3487
commit
61eadbd04a
5 changed files with 45 additions and 21 deletions
17
ChangeLog
17
ChangeLog
|
|
@ -1,3 +1,20 @@
|
|||
2003-02-26 David Ayers <d.ayers@inode.at>
|
||||
|
||||
* EOControl/EODebug.h: Include missing header for non-*-gnu-*.
|
||||
* EOAccess/EOAdaptor
|
||||
([EOAdaptor _performAdministativeStatementsForSelect:
|
||||
connectionDictionary:administrativeConnectionDictionary]):
|
||||
Add cast to silence warning.
|
||||
* EOControl/EOCheapArray.m ([EOCheapArray autorelease]):
|
||||
Replace objc_thread_id with GSCurrentThread.
|
||||
([EOCheapArray release]): Ditto.
|
||||
([EOCheapArray retainCount]): Ditto.
|
||||
([EOCheapArray retain]): Ditto.
|
||||
([EOCheapArray dealloc]): Ditto.
|
||||
([EOCheapArray shallowCopy]): Ditto.
|
||||
* EOControl/EOFault.m: Include missing header.
|
||||
([EOFault dealloc]): Replace objc_thread_id with GSCurrentThread.
|
||||
|
||||
2003-02-26 Matt Rice <ratmice@yahoo.com>
|
||||
|
||||
* EOAdaptors/Postgres95/Postgres95Channel.m: Added missing
|
||||
|
|
|
|||
|
|
@ -365,9 +365,9 @@ NSString *EOAdministrativeConnectionDictionaryKey
|
|||
NSArray *stmts;
|
||||
int i;
|
||||
|
||||
stmts = [[self expressionClass] performSelector: sel
|
||||
withObject: connDict
|
||||
withObject: admConnDict];
|
||||
stmts = [(id)[self expressionClass] performSelector: sel
|
||||
withObject: connDict
|
||||
withObject: admConnDict];
|
||||
|
||||
/*TODO: check if we need a model. */
|
||||
admAdaptor = [EOAdaptor adaptorWithName: [self name]];
|
||||
|
|
|
|||
|
|
@ -148,8 +148,8 @@ RCS_ID("$Id$")
|
|||
- (id) autorelease
|
||||
{
|
||||
#ifdef DEBUG
|
||||
NSDebugFLog(@"autorelease EOCheapCopyArray %p. ThreadID=%p [super retainCount]=%d",
|
||||
(void*)self,(void*)objc_thread_id(),[super retainCount]);
|
||||
NSDebugFLog(@"autorelease EOCheapCopyArray %p. %@ [super retainCount]=%d",
|
||||
(void*)self,GSCurrentThread(),[super retainCount]);
|
||||
#endif
|
||||
return [super autorelease];
|
||||
}
|
||||
|
|
@ -157,8 +157,8 @@ RCS_ID("$Id$")
|
|||
- (void) release
|
||||
{
|
||||
#ifdef DEBUG
|
||||
NSDebugFLog(@"Release EOCheapCopyArray %p. ThreadID=%p [super retainCount]=%d",
|
||||
(void*)self,(void*)objc_thread_id(),[super retainCount]);
|
||||
NSDebugFLog(@"Release EOCheapCopyArray %p. %@ [super retainCount]=%d",
|
||||
(void*)self,GSCurrentThread(),[super retainCount]);
|
||||
#endif
|
||||
[super release];
|
||||
}
|
||||
|
|
@ -166,8 +166,8 @@ RCS_ID("$Id$")
|
|||
- (unsigned int) retainCount
|
||||
{
|
||||
#ifdef DEBUG
|
||||
NSDebugFLog(@"retainCount EOCheapCopyArray %p. ThreadID=%p",
|
||||
(void*)self,(void*)objc_thread_id());
|
||||
NSDebugFLog(@"retainCount EOCheapCopyArray %p. %@",
|
||||
(void*)self,GSCurrentThread());
|
||||
#endif
|
||||
return [super retainCount];
|
||||
|
||||
|
|
@ -176,8 +176,8 @@ RCS_ID("$Id$")
|
|||
- (id) retain
|
||||
{
|
||||
#ifdef DEBUG
|
||||
NSDebugFLog(@"retain EOCheapCopyArray %p. ThreadID=%p, [super retainCount]=%d",
|
||||
(void*)self,(void*)objc_thread_id(),[super retainCount]);
|
||||
NSDebugFLog(@"retain EOCheapCopyArray %p. %@, [super retainCount]=%d",
|
||||
(void*)self,GSCurrentThread(),[super retainCount]);
|
||||
#endif
|
||||
return [super retain];
|
||||
}
|
||||
|
|
@ -276,16 +276,16 @@ RCS_ID("$Id$")
|
|||
NSDeallocateObject(self);
|
||||
|
||||
#ifdef DEBUG
|
||||
NSDebugFLog(@"Stop Dealloc EOCheapCopyMutableArray %p. ThreadID=%p",
|
||||
(void*)self,(void*)objc_thread_id());
|
||||
NSDebugFLog(@"Stop Dealloc EOCheapCopyMutableArray %p. %@",
|
||||
(void*)self,GSCurrentThread());
|
||||
#endif
|
||||
}
|
||||
|
||||
- (id) shallowCopy
|
||||
{
|
||||
#ifdef DEBUG
|
||||
NSDebugFLog(@"Start shallowCopy EOCheapCopyMutableArray %p. ThreadID=%p immutableCopy=%p",
|
||||
(void*)self,(void*)objc_thread_id(),_immutableCopy);
|
||||
NSDebugFLog(@"Start shallowCopy EOCheapCopyMutableArray %p. %@ immutableCopy=%p",
|
||||
(void*)self,GSCurrentThread(),_immutableCopy);
|
||||
#endif
|
||||
//OK
|
||||
if (!_immutableCopy)
|
||||
|
|
@ -299,8 +299,8 @@ RCS_ID("$Id$")
|
|||
RETAIN(_immutableCopy); // Because copy return a not autoreleased object. Retain for request caller
|
||||
|
||||
#ifdef DEBUG
|
||||
NSDebugFLog(@"Stop shallowCopy EOCheapCopyMutableArray %p. ThreadID=%p immutableCopy=%p",
|
||||
(void*)self,(void*)objc_thread_id(),_immutableCopy);
|
||||
NSDebugFLog(@"Stop shallowCopy EOCheapCopyMutableArray %p. %@ immutableCopy=%p",
|
||||
(void*)self,GSCurrentThread(),_immutableCopy);
|
||||
#endif
|
||||
return _immutableCopy;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -37,6 +37,10 @@
|
|||
#include <Foundation/Foundation.h>
|
||||
#endif
|
||||
|
||||
#ifndef GNUSTEP
|
||||
#include <GNUstepBase/GSCategories.h>
|
||||
#endif
|
||||
|
||||
#include <EOControl/EODefines.h>
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -47,6 +47,7 @@ RCS_ID("$Id$")
|
|||
#include <Foundation/NSString.h>
|
||||
#include <Foundation/NSObjCRuntime.h>
|
||||
#include <Foundation/NSInvocation.h>
|
||||
#include <Foundation/NSThread.h>
|
||||
#include <Foundation/NSException.h>
|
||||
#include <Foundation/NSDebug.h>
|
||||
#else
|
||||
|
|
@ -59,6 +60,8 @@ RCS_ID("$Id$")
|
|||
#include <GNUstepBase/GSCategories.h>
|
||||
#endif
|
||||
|
||||
#include <objc/Protocol.h>
|
||||
|
||||
#include <EOControl/EOFault.h>
|
||||
#include <EOControl/EOKeyGlobalID.h>
|
||||
#include <EOControl/EOEditingContext.h>
|
||||
|
|
@ -427,16 +430,16 @@ static Class EOFaultClass = NULL;
|
|||
- (void)dealloc
|
||||
{
|
||||
#ifdef DEBUG
|
||||
NSDebugFLog(@"Dealloc EOFault %p. ThreadID=%p",
|
||||
(void*)self,(void*)objc_thread_id());
|
||||
NSDebugFLog(@"Dealloc EOFault %p. %@",
|
||||
(void*)self,GSCurrentThread());
|
||||
#endif
|
||||
[EOFaultClass clearFault: self];
|
||||
NSDebugMLog(@"EOFault dealloc self=%p",self);
|
||||
if (![EOFaultClass isFault:self]) // otherwise, this loop.
|
||||
[self dealloc];
|
||||
#ifdef DEBUG
|
||||
NSDebugFLog(@"Stop Dealloc EOFault %p. ThreadID=%p",
|
||||
(void*)self,(void*)objc_thread_id());
|
||||
NSDebugFLog(@"Stop Dealloc EOFault %p. %@",
|
||||
(void*)self,GSCurrentThread());
|
||||
#endif
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue