mirror of
https://github.com/gnustep/libs-base.git
synced 2025-05-30 08:21:25 +00:00
removal of garbage collection
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/base/trunk@39608 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
parent
030f54a9cf
commit
d40d219015
72 changed files with 122 additions and 1787 deletions
|
@ -64,13 +64,6 @@
|
|||
#define GSI_MAP_EQUAL(M, X,Y) ((X).ptr == (Y).ptr)
|
||||
#define GSI_MAP_NOCLEAN 1
|
||||
|
||||
#if GS_WITH_GC
|
||||
#include <gc/gc_typed.h>
|
||||
static GC_descr nodeDesc; // Type descriptor for map node.
|
||||
#define GSI_MAP_NODES(M, X) \
|
||||
(GSIMapNode)GC_calloc_explicitly_typed(X, sizeof(GSIMapNode_t), nodeDesc)
|
||||
#endif
|
||||
|
||||
#include "GNUstepBase/GSIMap.h"
|
||||
|
||||
/*
|
||||
|
@ -369,14 +362,6 @@ static unsigned encodingVersion;
|
|||
|
||||
encodingVersion = [coder systemVersion];
|
||||
[coder release];
|
||||
#if GS_WITH_GC
|
||||
/* We create a typed memory descriptor for map nodes.
|
||||
*/
|
||||
GC_word w[GC_BITMAP_SIZE(GSIMapNode_t)] = {0};
|
||||
GC_set_bit(w, GC_WORD_OFFSET(GSIMapNode_t, key));
|
||||
GC_set_bit(w, GC_WORD_OFFSET(GSIMapNode_t, value));
|
||||
nodeDesc = GC_make_descriptor(w, GC_WORD_LEN(GSIMapNode_t));
|
||||
#endif
|
||||
connectionClass = [NSConnection class];
|
||||
mutableArrayClass = [NSMutableArray class];
|
||||
mutableDataClass = [NSMutableDataMalloc class];
|
||||
|
@ -1896,14 +1881,8 @@ static unsigned encodingVersion;
|
|||
/*
|
||||
* Set up map tables.
|
||||
*/
|
||||
#if GS_WITH_GC
|
||||
_clsMap
|
||||
= (GSIMapTable)NSAllocateCollectable(sizeof(GSIMapTable_t)*4,
|
||||
NSScannedOption);
|
||||
#else
|
||||
_clsMap
|
||||
= (GSIMapTable)NSZoneMalloc(_zone, sizeof(GSIMapTable_t)*4);
|
||||
#endif
|
||||
_cIdMap = &_clsMap[1];
|
||||
_uIdMap = &_clsMap[2];
|
||||
_ptrMap = &_clsMap[3];
|
||||
|
@ -1995,12 +1974,7 @@ static unsigned encodingVersion;
|
|||
*/
|
||||
if (firstTime == YES)
|
||||
{
|
||||
#if GS_WITH_GC
|
||||
_clsAry
|
||||
= NSAllocateCollectable(sizeof(GSIArray_t)*3, NSScannedOption);
|
||||
#else
|
||||
_clsAry = NSZoneMalloc(_zone, sizeof(GSIArray_t)*3);
|
||||
#endif
|
||||
_objAry = &_clsAry[1];
|
||||
_ptrAry = &_clsAry[2];
|
||||
GSIArrayInitWithZoneAndCapacity(_clsAry, _zone, sizeC);
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue