* Headers/GNUstepBase/GSIMap.h: Use GSI_MAP_NODE_IS_EMPTY macros

when checking in enumerator.
* Source/NSConcreteHashTable.m,
* Source/NSConcreteMapTable.m: Revert part of the weak pointer change.
This commit is contained in:
fredkiefer 2019-12-15 13:40:51 +01:00
parent 834e915b6d
commit d1cf30dd9f
4 changed files with 25 additions and 18 deletions

View file

@ -627,13 +627,7 @@ NSNextHashEnumeratorItem(NSHashEnumerator *enumerator)
}
else
{
NSConcreteHashTable *map = enumerator->map;
GSIMapKey k = GSI_MAP_READ_KEY(map, &n->key);
if (k.ptr == NULL)
{
return NSNextHashEnumeratorItem(enumerator);
}
return k.ptr;
return n->key.ptr;
}
}
else if (enumerator->node != 0) // Got an enumerator object