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

64bit safety fixes

Browse source 
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/base/trunk@32731 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Richard Frith-MacDonald 2011-03-29 08:16:02 +00:00
parent 2e1b6bafcb
commit c0979f8d17
10 changed files with 121 additions and 91 deletions
Download patch file Download diff file Expand all files Collapse all files

14
Source/NSKeyedArchiver.m
View file

@ -39,11 +39,11 @@
/*
* Setup for inline operation of pointer map tables.
*/
#define GSI_MAP_KTYPES GSUNION_PTR | GSUNION_OBJ | GSUNION_CLS | GSUNION_INT
#define GSI_MAP_VTYPES GSUNION_PTR | GSUNION_OBJ | GSUNION_INT
#define GSI_MAP_KTYPES GSUNION_PTR | GSUNION_OBJ | GSUNION_CLS | GSUNION_NSINT
#define GSI_MAP_VTYPES GSUNION_PTR | GSUNION_OBJ | GSUNION_NSINT
#define GSI_MAP_RETAIN_VAL(M, X)
#define GSI_MAP_RELEASE_VAL(M, X)
#define GSI_MAP_HASH(M, X) ((X).uint)
#define GSI_MAP_HASH(M, X) ((X).nsu)
#define GSI_MAP_EQUAL(M, X,Y) ((X).ptr == (Y).ptr)
#undef GSI_MAP_NOCLEAN
#if GS_WITH_GC
@ -258,7 +258,7 @@ static NSDictionary *makeReference(unsigned ref)
/*
* This object has already been conditionally encoded.
*/
ref = node->value.uint;
ref = node->value.nsu;
}
}
else
@ -296,7 +296,7 @@ static NSDictionary *makeReference(unsigned ref)
/*
* Conditionally encoded ... replace with actual value.
*/
ref = node->value.uint;
ref = node->value.nsu;
GSIMapAddPair(_uIdMap, (GSIMapKey)anObject, (GSIMapVal)ref);
GSIMapRemoveKey(_cIdMap, (GSIMapKey)anObject);
[_obj replaceObjectAtIndex: ref withObject: objectInfo];
@ -306,7 +306,7 @@ static NSDictionary *makeReference(unsigned ref)
}
else
{
ref = node->value.uint;
ref = node->value.nsu;
}
}
@ -409,7 +409,7 @@ static NSDictionary *makeReference(unsigned ref)
}
else
{
ref = node->value.uint;
ref = node->value.nsu;
}
/*