Author: fredkiefer
Date: Fri Aug 21 21:21:46 2015
New Revision: 38914
URL: http://svn.gna.org/viewcvs/gnustep?rev=38914&view=rev
Log:
* Source/NSMatrix.m: Remove GC ifdefs.
Modified:
libs/gui/trunk/ChangeLog
libs/gui/trunk/Source/NSMatrix.m
Modified: libs/gui/trunk/ChangeLog
URL:
http://svn.gna.org/viewcvs/gnustep/libs/gui/trunk/ChangeLog?rev=38914&r1=38913&r2=38914&view=diff
==============================================================================
--- libs/gui/trunk/ChangeLog (original)
+++ libs/gui/trunk/ChangeLog Fri Aug 21 21:21:46 2015
@@ -1,3 +1,7 @@
+2015-08-21 Fred Kiefer <[email protected]>
+
+ * Source/NSMatrix.m: Remove GC ifdefs.
+
2015-08-16 Fred Kiefer <[email protected]>
* Resources/Korean.lproj/Localizable.strings: Add Korean translations.
Modified: libs/gui/trunk/Source/NSMatrix.m
URL:
http://svn.gna.org/viewcvs/gnustep/libs/gui/trunk/Source/NSMatrix.m?rev=38914&r1=38913&r2=38914&view=diff
==============================================================================
--- libs/gui/trunk/Source/NSMatrix.m (original)
+++ libs/gui/trunk/Source/NSMatrix.m Fri Aug 21 21:21:46 2015
@@ -404,11 +404,7 @@
[_cells[i][j] release];
}
NSZoneFree(_myZone, _cells[i]);
-#if GS_WITH_GC
- _selectedCells[i] = 0;
-#else
NSZoneFree(_myZone, _selectedCells[i]);
-#endif
}
NSZoneFree(_myZone, _cells);
NSZoneFree(_myZone, _selectedCells);
@@ -816,13 +812,11 @@
{
NSInteger i;
-#if GS_WITH_GC == 0
for (i = 0; i < _maxCols; i++)
{
AUTORELEASE(_cells[row][i]);
}
NSZoneFree(_myZone, _selectedCells[row]);
-#endif
NSZoneFree(_myZone, _cells[row]);
for (i = row + 1; i < _maxRows; i++)
{
@@ -4044,13 +4038,8 @@
for (i = 0; i < oldMaxR; i++)
{
_cells[i] = NSZoneRealloc(_myZone, _cells[i], col * sizeof(id));
-#if GS_WITH_GC
- _selectedCells[i] = NSReallocateCollectable(
- _selectedCells[i], col * sizeof(BOOL), 0);
-#else
- _selectedCells[i] = NSZoneRealloc(_myZone,
- _selectedCells[i], col * sizeof(BOOL));
-#endif
+ _selectedCells[i] = NSZoneRealloc(_myZone, _selectedCells[i],
+ col * sizeof(BOOL));
for (j = oldMaxC; j < col; j++)
{
@@ -4080,11 +4069,8 @@
for (i = oldMaxR; i < row; i++)
{
_cells[i] = NSZoneMalloc(_myZone, _maxCols * sizeof(id));
-#if GS_WITH_GC
- _selectedCells[i] = NSAllocateCollectable(_maxCols * sizeof(BOOL), 0);
-#else
_selectedCells[i] = NSZoneMalloc(_myZone, _maxCols * sizeof(BOOL));
-#endif
+
if (i == end)
{
for (j = 0; j < _maxCols; j++)
_______________________________________________
Gnustep-cvs mailing list
[email protected]
https://mail.gna.org/listinfo/gnustep-cvs
