gnustep/libs-base
0
0
Fork 0
mirror of https://github.com/gnustep/libs-base.git synced 2025-04-22 16:33:29 +00:00
Code Issues Projects Releases Packages Wiki Activity

Reverting change to keyed unarchiver. The replaceObject: method has been moved to GSNibCompatibility. I want to keep the changes to base to a minimum.

Browse source 
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/base/branches/NibCompatibility@22952 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Gregory John Casamento 2006-05-20 14:37:56 +00:00
parent 057b19f761
commit 516414cc9f
1 changed files with 2 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
Source/NSKeyedUnarchiver.m
View file

@ -45,11 +45,6 @@
#include <Foundation/NSKeyedArchiver.h>
#undef _IN_NSKEYEDUNARCHIVER_M
@interface NilMarker: NSObject
@end
@implementation NilMarker
@end
/**
* An unarchiving error has occurred.
*/
@ -252,34 +247,13 @@ static NSMapTable globalClassMap = 0;
if (obj == nil)
{
// Record NilMarker for decoded object.
// Record NSNull marker for decoded object.
o = GSIArrayItemAtIndex(_objMap, 0).obj;
GSIArraySetItemAtIndex(_objMap, (GSIArrayItem)o, index);
}
return obj;
}
- (BOOL) replaceObject: (id)oldObj withObject: (id)newObj
{
unsigned int i = 0;
unsigned int count = GSIArrayCount(_objMap);
for(i = 0; i < count; i++)
{
id obj = GSIArrayItemAtIndex(_objMap, i).obj;
if(obj == oldObj)
break;
}
if(i < count)
{
GSIArraySetItemAtIndex(_objMap, (GSIArrayItem)newObj, i);
return YES;
}
return NO;
}
@end
@ -798,7 +772,7 @@ static NSMapTable globalClassMap = 0;
count = [_objects count];
GSIArrayInitWithZoneAndCapacity(_objMap, _zone, count);
// Add marker for nil object
GSIArrayAddItem(_objMap, (GSIArrayItem)((id)[NilMarker class]));
GSIArrayAddItem(_objMap, (GSIArrayItem)((id)[NSNull null]));
// Add markers for unencoded objects.
for (i = 1; i < count; i++)
{