mirror of
https://github.com/gnustep/libs-gui.git
synced 2025-04-23 15:11:37 +00:00
Hacks by Greg to placate 4.1 compiler. Just in case we can't persuade them
to 'fix' cast to union with an 'id' member. git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gui/trunk@21783 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
parent
8943b5d429
commit
bd8fb5fc53
2 changed files with 6 additions and 6 deletions
|
@ -86,7 +86,7 @@ cacheAttributes(NSDictionary *attrs)
|
|||
GSIMapNode node;
|
||||
|
||||
ALOCK();
|
||||
node = GSIMapNodeForKey(&attrMap, (GSIMapKey)attrs);
|
||||
node = GSIMapNodeForKey(&attrMap, (GSIMapKey)((id)attrs));
|
||||
if (node == 0)
|
||||
{
|
||||
/*
|
||||
|
@ -94,7 +94,7 @@ cacheAttributes(NSDictionary *attrs)
|
|||
* in an immutable dictionary that can safely be cached.
|
||||
*/
|
||||
attrs = [[NSDictionary alloc] initWithDictionary: attrs copyItems: NO];
|
||||
GSIMapAddPair(&attrMap, (GSIMapKey)attrs, (GSIMapVal)(unsigned)1);
|
||||
GSIMapAddPair(&attrMap, (GSIMapKey)((id)attrs), (GSIMapVal)(unsigned)1);
|
||||
}
|
||||
else
|
||||
{
|
||||
|
@ -111,12 +111,12 @@ unCacheAttributes(NSDictionary *attrs)
|
|||
GSIMapBucket bucket;
|
||||
|
||||
ALOCK();
|
||||
bucket = GSIMapBucketForKey(&attrMap, (GSIMapKey)attrs);
|
||||
bucket = GSIMapBucketForKey(&attrMap, (GSIMapKey)((id)attrs));
|
||||
if (bucket != 0)
|
||||
{
|
||||
GSIMapNode node;
|
||||
|
||||
node = GSIMapNodeForKeyInBucket(&attrMap, bucket, (GSIMapKey)attrs);
|
||||
node = GSIMapNodeForKeyInBucket(&attrMap, bucket, (GSIMapKey)((id)attrs));
|
||||
if (node != 0)
|
||||
{
|
||||
if (--node->value.uint == 0)
|
||||
|
|
|
@ -3065,7 +3065,7 @@ static NSView* findByTag(NSView *view, int aTag, unsigned *level)
|
|||
/*
|
||||
* Set up 'previous' link in aView to point to us.
|
||||
*/
|
||||
GSIArraySetItemAtIndex(pKV(aView), (GSIArrayItem)self, 0);
|
||||
GSIArraySetItemAtIndex(pKV(aView), (GSIArrayItem)((id)self), 0);
|
||||
|
||||
/*
|
||||
* Tell our current 'next' view that we are no longer pointing to it.
|
||||
|
@ -3094,7 +3094,7 @@ static NSView* findByTag(NSView *view, int aTag, unsigned *level)
|
|||
/*
|
||||
* Set up 'next' link to point to aView.
|
||||
*/
|
||||
GSIArraySetItemAtIndex(nKV(self), (GSIArrayItem)aView, 0);
|
||||
GSIArraySetItemAtIndex(nKV(self), (GSIArrayItem)((id)aView), 0);
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
Loading…
Reference in a new issue