gnustep/libs-base
0
0
Fork 0
mirror of https://github.com/gnustep/libs-base.git synced 2025-04-23 09:04:13 +00:00
Code Issues Projects Releases Packages Wiki Activity

casts to keep compiler happy

Browse source 
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/base/trunk@32733 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Richard Frith-MacDonald 2011-03-29 09:40:14 +00:00
parent c0979f8d17
commit 4918e76599
6 changed files with 57 additions and 47 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Source/GSAttributedString.m
View file

@ -144,7 +144,7 @@ cacheAttributes(NSDictionary *attrs)
* in an immutable dictionary that can safely be cached.
*/
attrs = [[NSDictionary alloc] initWithDictionary: attrs copyItems: NO];
GSIMapAddPair(&attrMap, (GSIMapKey)((id)attrs), (GSIMapVal)(unsigned)1);
GSIMapAddPair(&attrMap, (GSIMapKey)((id)attrs), (GSIMapVal)(NSUInteger)1);
}
else
{

17
Source/NSArchiver.m
View file

@ -378,7 +378,7 @@ static Class NSMutableDataMallocClass;
if (node == 0)
{
GSIMapAddPair(_ptrMap,
(GSIMapKey)*(void**)buf, (GSIMapVal)0);
(GSIMapKey)*(void**)buf, (GSIMapVal)(NSUInteger)0);
type++;
buf = *(char**)buf;
(*_eValImp)(self, eValSel, type, buf);
@ -392,7 +392,7 @@ static Class NSMutableDataMallocClass;
if (node == 0)
{
node = GSIMapAddPair(_ptrMap,
(GSIMapKey)*(void**)buf, (GSIMapVal)++_xRefP);
(GSIMapKey)*(void**)buf, (GSIMapVal)(NSUInteger)++_xRefP);
}
else
{
@ -458,7 +458,7 @@ static Class NSMutableDataMallocClass;
format: @"negative class version"];
}
node = GSIMapAddPair(_clsMap,
(GSIMapKey)(void*)c, (GSIMapVal)++_xRefC);
(GSIMapKey)(void*)c, (GSIMapVal)(NSUInteger)++_xRefC);
/*
* Encode tag and crossref number.
*/
@ -508,7 +508,7 @@ static Class NSMutableDataMallocClass;
if (node == 0)
{
node = GSIMapAddPair(_ptrMap,
(GSIMapKey)(void*)s, (GSIMapVal)++_xRefP);
(GSIMapKey)(void*)s, (GSIMapVal)(NSUInteger)++_xRefP);
(*_xRefImp)(_dst, xRefSel, _GSC_SEL, node->value.nsu);
/*
* Encode selector.
@ -539,7 +539,7 @@ static Class NSMutableDataMallocClass;
if (node == 0)
{
node = GSIMapAddPair(_ptrMap,
(GSIMapKey)*(char**)buf, (GSIMapVal)++_xRefP);
(GSIMapKey)*(char**)buf, (GSIMapVal)(NSUInteger)++_xRefP);
(*_xRefImp)(_dst, xRefSel, _GSC_CHARPTR, node->value.nsu);
(*_serImp)(_dst, serSel, buf, type, nil);
}
@ -696,7 +696,7 @@ static Class NSMutableDataMallocClass;
return;
}
GSIMapAddPair(_cIdMap, (GSIMapKey)anObject, (GSIMapVal)0);
GSIMapAddPair(_cIdMap, (GSIMapKey)anObject, (GSIMapVal)(NSUInteger)0);
}
else if (anObject == nil)
{
@ -788,7 +788,8 @@ static Class NSMutableDataMallocClass;
* and add it to the map of unconditionay encoded ones.
*/
GSIMapRemoveKey(_cIdMap, (GSIMapKey)anObject);
GSIMapAddPair(_uIdMap, (GSIMapKey)anObject, (GSIMapVal)0);
GSIMapAddPair(_uIdMap,
(GSIMapKey)anObject, (GSIMapVal)(NSUInteger)0);
[anObject encodeWithCoder: self];
}
return;
@ -802,7 +803,7 @@ static Class NSMutableDataMallocClass;
if (node == 0)
{
node = GSIMapAddPair(_uIdMap,
(GSIMapKey)anObject, (GSIMapVal)++_xRefO);
(GSIMapKey)anObject, (GSIMapVal)(NSUInteger)++_xRefO);
}
else
{

52
Source/NSConnection.m
View file

@ -659,11 +659,11 @@ static NSLock *cached_proxies_gate = nil;
targetToCached =
NSCreateMapTable(NSIntMapKeyCallBacks,
NSObjectMapValueCallBacks, 0);
NSObjectMapValueCallBacks, 0);
root_object_map =
NSCreateMapTable(NSNonOwnedPointerMapKeyCallBacks,
NSObjectMapValueCallBacks, 0);
NSObjectMapValueCallBacks, 0);
if (connection_table_gate == nil)
{
@ -2044,7 +2044,7 @@ static NSLock *cached_proxies_gate = nil;
* a response, we must check for it and scrap it if necessary.
*/
M_LOCK(IrefGate);
node = GSIMapNodeForKey(IreplyMap, (GSIMapKey)seq);
node = GSIMapNodeForKey(IreplyMap, (GSIMapKey)(NSUInteger)seq);
if (node != 0 && node->value.obj != dummyObject)
{
BOOL is_exception = NO;
@ -2058,7 +2058,7 @@ static NSLock *cached_proxies_gate = nil;
NSLog(@"Got response with %@", NSStringFromSelector(sel));
[self _doneInRmc: node->value.obj];
}
GSIMapRemoveKey(IreplyMap, (GSIMapKey)seq);
GSIMapRemoveKey(IreplyMap, (GSIMapKey)(NSUInteger)seq);
M_UNLOCK(IrefGate);
}
else
@ -2376,7 +2376,8 @@ static NSLock *cached_proxies_gate = nil;
break;
}
M_LOCK(GSIVar(conn, _refGate));
node = GSIMapNodeForKey(GSIVar(conn, _replyMap), (GSIMapKey)sequence);
node = GSIMapNodeForKey(GSIVar(conn, _replyMap),
(GSIMapKey)(NSUInteger)sequence);
if (node == 0)
{
NSDebugMLLog(@"NSConnection", @"Ignoring reply RMC %d on %@",
@ -3135,7 +3136,7 @@ static NSLock *cached_proxies_gate = nil;
sn, self);
M_LOCK(IrefGate); isLocked = YES;
while (IisValid == YES
&& (node = GSIMapNodeForKey(IreplyMap, (GSIMapKey)sn)) != 0
&& (node = GSIMapNodeForKey(IreplyMap, (GSIMapKey)(NSUInteger)sn)) != 0
&& node->value.obj == dummyObject)
{
NSDate *limit_date;
@ -3185,7 +3186,7 @@ static NSLock *cached_proxies_gate = nil;
|| [timeout_date timeIntervalSinceNow] <= 0.0)
{
M_LOCK(IrefGate); isLocked = YES;
node = GSIMapNodeForKey(IreplyMap, (GSIMapKey)sn);
node = GSIMapNodeForKey(IreplyMap, (GSIMapKey)(NSUInteger)sn);
break;
}
else if (warned == NO && [start_date timeIntervalSinceNow] <= -300.0)
@ -3203,7 +3204,7 @@ static NSLock *cached_proxies_gate = nil;
else
{
rmc = node->value.obj;
GSIMapRemoveKey(IreplyMap, (GSIMapKey)sn);
GSIMapRemoveKey(IreplyMap, (GSIMapKey)(NSUInteger)sn);
}
M_UNLOCK(IrefGate); isLocked = NO;
TEST_RELEASE(start_date);
@ -3358,7 +3359,8 @@ static NSLock *cached_proxies_gate = nil;
*/
if (rep == YES)
{
GSIMapAddPair(IreplyMap, (GSIMapKey)sno, (GSIMapVal)dummyObject);
GSIMapAddPair(IreplyMap,
(GSIMapKey)(NSUInteger)sno, (GSIMapVal)dummyObject);
}
/*
* Locate or create an rmc
@ -3512,12 +3514,13 @@ static NSLock *cached_proxies_gate = nil;
*/
node = GSIMapNodeForKey(IlocalObjects, (GSIMapKey)object);
NSAssert(node == 0, NSInternalInconsistencyException);
node = GSIMapNodeForKey(IlocalTargets, (GSIMapKey)target);
node = GSIMapNodeForKey(IlocalTargets, (GSIMapKey)(NSUInteger)target);
NSAssert(node == 0, NSInternalInconsistencyException);
IF_NO_GC([anObj retain];)
GSIMapAddPair(IlocalObjects, (GSIMapKey)object, (GSIMapVal)((id)anObj));
GSIMapAddPair(IlocalTargets, (GSIMapKey)target, (GSIMapVal)((id)anObj));
GSIMapAddPair(IlocalTargets,
(GSIMapKey)(NSUInteger)target, (GSIMapVal)((id)anObj));
if (debug_connection > 2)
NSLog(@"add local object (0x%x) target (0x%x) "
@ -3611,7 +3614,7 @@ static NSLock *cached_proxies_gate = nil;
/*
* Remove the target info too - no release required.
*/
GSIMapRemoveKey(IlocalTargets, (GSIMapKey)target);
GSIMapRemoveKey(IlocalTargets, (GSIMapKey)(NSUInteger)target);
if (debug_connection > 2)
NSLog(@"removed local object (0x%x) target (0x%x) "
@ -3669,7 +3672,7 @@ static NSLock *cached_proxies_gate = nil;
* Try a quick lookup to see if the target references a local object
* belonging to the receiver ... usually it should.
*/
node = GSIMapNodeForKey(IlocalTargets, (GSIMapKey)target);
node = GSIMapNodeForKey(IlocalTargets, (GSIMapKey)(NSUInteger)target);
if (node != 0)
{
proxy = node->value.obj;
@ -3720,7 +3723,7 @@ static NSLock *cached_proxies_gate = nil;
{
M_LOCK(GSIVar(c, _refGate));
node = GSIMapNodeForKey(GSIVar(c, _localTargets),
(GSIMapKey)target);
(GSIMapKey)(NSUInteger)target);
if (node != 0)
{
id local;
@ -3742,10 +3745,11 @@ static NSLock *cached_proxies_gate = nil;
proxy = [NSDistantObject proxyWithLocal: local
connection: self];
nTarget = proxy->_handle;
GSIMapRemoveKey(IlocalTargets, (GSIMapKey)nTarget);
GSIMapRemoveKey(IlocalTargets,
(GSIMapKey)(NSUInteger)nTarget);
proxy->_handle = target;
GSIMapAddPair(IlocalTargets, (GSIMapKey)target,
(GSIMapVal)((id)proxy));
GSIMapAddPair(IlocalTargets,
(GSIMapKey)(NSUInteger)target, (GSIMapVal)((id)proxy));
}
M_UNLOCK(GSIVar(c, _refGate));
}
@ -3778,7 +3782,7 @@ static NSLock *cached_proxies_gate = nil;
/* Don't assert (IisValid); */
M_LOCK(IrefGate);
node = GSIMapNodeForKey(IremoteProxies, (GSIMapKey)target);
node = GSIMapNodeForKey(IremoteProxies, (GSIMapKey)(NSUInteger)target);
if (node == 0)
{
found = nil;
@ -3839,7 +3843,7 @@ static NSLock *cached_proxies_gate = nil;
GSIMapNode node;
target = aProxy->_handle;
node = GSIMapNodeForKey(IremoteProxies, (GSIMapKey)target);
node = GSIMapNodeForKey(IremoteProxies, (GSIMapKey)(NSUInteger)target);
/*
* Only remove if the proxy for the target is the same as the
@ -3848,7 +3852,7 @@ static NSLock *cached_proxies_gate = nil;
if (node != 0 && node->value.obj == aProxy)
{
count = aProxy->_counter;
GSIMapRemoveKey(IremoteProxies, (GSIMapKey)target);
GSIMapRemoveKey(IremoteProxies, (GSIMapKey)(NSUInteger)target);
/*
* Tell the remote application that we have removed our proxy and
* it can release it's local object.
@ -3889,7 +3893,7 @@ static NSLock *cached_proxies_gate = nil;
NSParameterAssert(aProxy == nil || aTarget == aProxy->_handle);
M_LOCK(IrefGate);
node = GSIMapNodeForKey(IremoteProxies, (GSIMapKey)aTarget);
node = GSIMapNodeForKey(IremoteProxies, (GSIMapKey)(NSUInteger)aTarget);
if (node == 0)
{
p = nil;
@ -3902,7 +3906,7 @@ static NSLock *cached_proxies_gate = nil;
if (p == nil && aProxy != nil)
{
p = aProxy;
GSIMapAddPair(IremoteProxies, (GSIMapKey)aTarget, (GSIMapVal)((id)p));
GSIMapAddPair(IremoteProxies, (GSIMapKey)(NSUInteger)aTarget, (GSIMapVal)((id)p));
}
/*
* Whether this is a new proxy or an existing proxy, this method is
@ -3925,7 +3929,7 @@ static NSLock *cached_proxies_gate = nil;
/* Don't assert (IisValid); */
M_LOCK(IrefGate);
node = GSIMapNodeForKey(IlocalObjects, (GSIMapKey)anObj);
node = GSIMapNodeForKey(IlocalObjects, (GSIMapKey)(NSUInteger)anObj);
if (node == 0)
{
ret = nil;
@ -3945,7 +3949,7 @@ static NSLock *cached_proxies_gate = nil;
/* Don't assert (IisValid); */
M_LOCK(IrefGate);
node = GSIMapNodeForKey(IlocalTargets, (GSIMapKey)target);
node = GSIMapNodeForKey(IlocalTargets, (GSIMapKey)(NSUInteger)target);
if (node == 0)
{
ret = nil;

12
Source/NSKeyedArchiver.m
View file

@ -246,7 +246,8 @@ static NSDictionary *makeReference(unsigned ref)
if (node == 0)
{
ref = [_obj count];
GSIMapAddPair(_cIdMap, (GSIMapKey)anObject, (GSIMapVal)ref);
GSIMapAddPair(_cIdMap,
(GSIMapKey)anObject, (GSIMapVal)(NSUInteger)ref);
/*
* Use the null object as a placeholder for a conditionally
* encoded object.
@ -288,7 +289,8 @@ static NSDictionary *makeReference(unsigned ref)
* Not encoded ... create dictionary for it.
*/
ref = [_obj count];
GSIMapAddPair(_uIdMap, (GSIMapKey)anObject, (GSIMapVal)ref);
GSIMapAddPair(_uIdMap,
(GSIMapKey)anObject, (GSIMapVal)(NSUInteger)ref);
[_obj addObject: objectInfo];
}
else
@ -297,7 +299,8 @@ static NSDictionary *makeReference(unsigned ref)
* Conditionally encoded ... replace with actual value.
*/
ref = node->value.nsu;
GSIMapAddPair(_uIdMap, (GSIMapKey)anObject, (GSIMapVal)ref);
GSIMapAddPair(_uIdMap,
(GSIMapKey)anObject, (GSIMapVal)(NSUInteger)ref);
GSIMapRemoveKey(_cIdMap, (GSIMapKey)anObject);
[_obj replaceObjectAtIndex: ref withObject: objectInfo];
}
@ -379,7 +382,8 @@ static NSDictionary *makeReference(unsigned ref)
NSMutableArray *hierarchy;
ref = [_obj count];
GSIMapAddPair(_uIdMap, (GSIMapKey)c, (GSIMapVal)ref);
GSIMapAddPair(_uIdMap,
(GSIMapKey)c, (GSIMapVal)(NSUInteger)ref);
cDict = [[NSMutableDictionary alloc] initWithCapacity: 2];
/*

17
Source/NSPortCoder.m
View file

@ -1215,7 +1215,7 @@ static IMP _xRefImp; /* Serialize a crossref. */
return;
}
GSIMapAddPair(_cIdMap, (GSIMapKey)anObject, (GSIMapVal)0);
GSIMapAddPair(_cIdMap, (GSIMapKey)anObject, (GSIMapVal)(NSUInteger)0);
}
else if (anObject == nil)
{
@ -1292,7 +1292,8 @@ static IMP _xRefImp; /* Serialize a crossref. */
* and add it to the map of unconditionay encoded ones.
*/
GSIMapRemoveKey(_cIdMap, (GSIMapKey)anObject);
GSIMapAddPair(_uIdMap, (GSIMapKey)anObject, (GSIMapVal)0);
GSIMapAddPair(_uIdMap,
(GSIMapKey)anObject, (GSIMapVal)(NSUInteger)0);
[anObject encodeWithCoder: self];
}
return;
@ -1306,7 +1307,7 @@ static IMP _xRefImp; /* Serialize a crossref. */
if (node == 0)
{
node = GSIMapAddPair(_uIdMap,
(GSIMapKey)anObject, (GSIMapVal)++_xRefO);
(GSIMapKey)anObject, (GSIMapVal)(NSUInteger)++_xRefO);
}
else
{
@ -1459,7 +1460,7 @@ static IMP _xRefImp; /* Serialize a crossref. */
if (node == 0)
{
GSIMapAddPair(_ptrMap,
(GSIMapKey)*(void**)buf, (GSIMapVal)0);
(GSIMapKey)*(void**)buf, (GSIMapVal)(NSUInteger)0);
type++;
buf = *(char**)buf;
(*_eValImp)(self, eValSel, type, buf);
@ -1473,7 +1474,7 @@ static IMP _xRefImp; /* Serialize a crossref. */
if (node == 0)
{
node = GSIMapAddPair(_ptrMap,
(GSIMapKey)*(void**)buf, (GSIMapVal)++_xRefP);
(GSIMapKey)*(void**)buf, (GSIMapVal)(NSUInteger)++_xRefP);
}
else
{
@ -1539,7 +1540,7 @@ static IMP _xRefImp; /* Serialize a crossref. */
format: @"negative class version"];
}
node = GSIMapAddPair(_clsMap,
(GSIMapKey)(void*)c, (GSIMapVal)++_xRefC);
(GSIMapKey)(void*)c, (GSIMapVal)(NSUInteger)++_xRefC);
/*
* Encode tag and crossref number.
*/
@ -1589,7 +1590,7 @@ static IMP _xRefImp; /* Serialize a crossref. */
if (node == 0)
{
node = GSIMapAddPair(_ptrMap,
(GSIMapKey)(void*)s, (GSIMapVal)++_xRefP);
(GSIMapKey)(void*)s, (GSIMapVal)(NSUInteger)++_xRefP);
(*_xRefImp)(_dst, xRefSel, _GSC_SEL, node->value.nsu);
/*
* Encode selector.
@ -1620,7 +1621,7 @@ static IMP _xRefImp; /* Serialize a crossref. */
if (node == 0)
{
node = GSIMapAddPair(_ptrMap,
(GSIMapKey)*(char**)buf, (GSIMapVal)++_xRefP);
(GSIMapKey)*(char**)buf, (GSIMapVal)(NSUInteger)++_xRefP);
(*_xRefImp)(_dst, xRefSel, _GSC_CHARPTR, node->value.nsu);
(*_eSerImp)(_dst, eSerSel, buf, type, nil);
}

4
Source/NSSerializer.m
View file

@ -212,7 +212,7 @@ serializeToInfo(id object, _NSSerializerInfo* info)
encoding: NSASCIIStringEncoding];
if (info->shouldUnique)
GSIMapAddPair(&info->map,
(GSIMapKey)object, (GSIMapVal)info->count++);
(GSIMapKey)object, (GSIMapVal)(NSUInteger)info->count++);
}
else
{
@ -256,7 +256,7 @@ serializeToInfo(id object, _NSSerializerInfo* info)
[object getCharacters: (*info->datImp)(info->data, datSel) + dlen];
if (info->shouldUnique)
GSIMapAddPair(&info->map,
(GSIMapKey)object, (GSIMapVal)info->count++);
(GSIMapKey)object, (GSIMapVal)(NSUInteger)info->count++);
}
else
{