Author: rfm
Date: Wed Jul 22 10:26:30 2015
New Revision: 38825
URL: http://svn.gna.org/viewcvs/gnustep?rev=38825&view=rev
Log:
Fix for nonfragile-abi
Modified:
libs/base/trunk/ChangeLog
libs/base/trunk/Source/NSConcreteHashTable.m
libs/base/trunk/Source/NSConcreteMapTable.m
Modified: libs/base/trunk/ChangeLog
URL:
http://svn.gna.org/viewcvs/gnustep/libs/base/trunk/ChangeLog?rev=38825&r1=38824&r2=38825&view=diff
==============================================================================
--- libs/base/trunk/ChangeLog (original)
+++ libs/base/trunk/ChangeLog Wed Jul 22 10:26:30 2015
@@ -1,3 +1,9 @@
+2015-07-22 Richard Frith-Macdonald <[email protected]>
+
+ * Source/NSConcreteHashTable.m:
+ * Source/NSConcreteMapTable.m:
+ Get instance size at run time, so we can compile using nonfragile-abi
+
2015-07-16 Niels Grewe <[email protected]>
* Source/GSSet.m
Modified: libs/base/trunk/Source/NSConcreteHashTable.m
URL:
http://svn.gna.org/viewcvs/gnustep/libs/base/trunk/Source/NSConcreteHashTable.m?rev=38825&r1=38824&r2=38825&view=diff
==============================================================================
--- libs/base/trunk/Source/NSConcreteHashTable.m (original)
+++ libs/base/trunk/Source/NSConcreteHashTable.m Wed Jul 22 10:26:30 2015
@@ -827,11 +827,14 @@
@implementation NSConcreteHashTable
+static unsigned instanceSize = 0;
+
+ (void) initialize
{
if (concreteClass == Nil)
{
concreteClass = [NSConcreteHashTable class];
+ instanceSize = class_getInstanceSize(concreteClass);
}
#if GS_WITH_GC
/* We create a typed memory descriptor for hash nodes.
@@ -1084,7 +1087,7 @@
* }
* GSIMapEndEnumerator(&enumerator);
*/
- size += GSIMapSize(self) - sizeof(GSI_MAP_TABLE_T);
+ size += GSIMapSize(self) - instanceSize;
}
return size;
}
Modified: libs/base/trunk/Source/NSConcreteMapTable.m
URL:
http://svn.gna.org/viewcvs/gnustep/libs/base/trunk/Source/NSConcreteMapTable.m?rev=38825&r1=38824&r2=38825&view=diff
==============================================================================
--- libs/base/trunk/Source/NSConcreteMapTable.m (original)
+++ libs/base/trunk/Source/NSConcreteMapTable.m Wed Jul 22 10:26:30 2015
@@ -1185,11 +1185,14 @@
@implementation NSConcreteMapTable
+static unsigned instanceSize = 0;
+
+ (void) initialize
{
if (concreteClass == Nil)
{
concreteClass = [NSConcreteMapTable class];
+ instanceSize = class_getInstanceSize(concreteClass);
}
#if GS_WITH_GC
/* We create a typed memory descriptor for map nodes.
@@ -1450,7 +1453,7 @@
* }
* GSIMapEndEnumerator(&enumerator);
*/
- size += GSIMapSize(self) - sizeof(GSI_MAP_TABLE_T);
+ size += GSIMapSize(self) - instanceSize;
}
return size;
}
_______________________________________________
Gnustep-cvs mailing list
[email protected]
https://mail.gna.org/listinfo/gnustep-cvs
