gnustep/libs-base
0
0
Fork 0
mirror of https://github.com/gnustep/libs-base.git synced 2025-05-31 00:30:53 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix for nonfragile-abi

Browse source 
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/base/trunk@38825 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Richard Frith-MacDonald 2015-07-22 08:26:30 +00:00
parent a4d1a09c89
commit d4234288d5
3 changed files with 14 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

6
ChangeLog
View file

@ -1,3 +1,9 @@
2015-07-22 Richard Frith-Macdonald <rfm@gnu.org>
* Source/NSConcreteHashTable.m:
* Source/NSConcreteMapTable.m:
Get instance size at run time, so we can compile using nonfragile-abi
2015-07-16 Niels Grewe <niels.grewe@halbordnung.de> 2015-07-16 Niels Grewe <niels.grewe@halbordnung.de>
* Source/GSSet.m * Source/GSSet.m

5
Source/NSConcreteHashTable.m
View file

@ -827,11 +827,14 @@ const NSHashTableCallBacks NSPointerToStructHashCallBacks =
@implementation NSConcreteHashTable @implementation NSConcreteHashTable
static unsigned instanceSize = 0;
+ (void) initialize + (void) initialize
{ {
if (concreteClass == Nil) if (concreteClass == Nil)
{ {
concreteClass = [NSConcreteHashTable class]; concreteClass = [NSConcreteHashTable class];
instanceSize = class_getInstanceSize(concreteClass);
} }
#if GS_WITH_GC #if GS_WITH_GC
/* We create a typed memory descriptor for hash nodes. /* We create a typed memory descriptor for hash nodes.
@ -1084,7 +1087,7 @@ const NSHashTableCallBacks NSPointerToStructHashCallBacks =
* } * }
* GSIMapEndEnumerator(&enumerator); * GSIMapEndEnumerator(&enumerator);
*/ */
size += GSIMapSize(self) - sizeof(GSI_MAP_TABLE_T); size += GSIMapSize(self) - instanceSize;
} }
return size; return size;
} }

5
Source/NSConcreteMapTable.m
View file

@ -1185,11 +1185,14 @@ const NSMapTableValueCallBacks NSOwnedPointerMapValueCallBacks =
@implementation NSConcreteMapTable @implementation NSConcreteMapTable
static unsigned instanceSize = 0;
+ (void) initialize + (void) initialize
{ {
if (concreteClass == Nil) if (concreteClass == Nil)
{ {
concreteClass = [NSConcreteMapTable class]; concreteClass = [NSConcreteMapTable class];
instanceSize = class_getInstanceSize(concreteClass);
} }
#if GS_WITH_GC #if GS_WITH_GC
/* We create a typed memory descriptor for map nodes. /* We create a typed memory descriptor for map nodes.
@ -1450,7 +1453,7 @@ const NSMapTableValueCallBacks NSOwnedPointerMapValueCallBacks =
* } * }
* GSIMapEndEnumerator(&enumerator); * GSIMapEndEnumerator(&enumerator);
*/ */
size += GSIMapSize(self) - sizeof(GSI_MAP_TABLE_T); size += GSIMapSize(self) - instanceSize;
} }
return size; return size;
} }