diff --git a/ChangeLog b/ChangeLog index 0e0271fc7..2839b1b31 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2015-07-16 Niels Grewe + + * Source/GSSet.m + * Source/GSCountedSet.m: + Fix a few more names. + 2015-07-16 Richard Frith-Macdonald * Headers/GNUstepBase/GSIMap.h: diff --git a/Source/GSCountedSet.m b/Source/GSCountedSet.m index e5a18246d..7c8b54e53 100644 --- a/Source/GSCountedSet.m +++ b/Source/GSCountedSet.m @@ -395,7 +395,7 @@ static GC_descr nodeDesc; // Type descriptor for map node. (&map, state, stackbuf, len); } -- (NSUInteger) sizeInBytes: (NSHashTable*)exclude +- (NSUInteger) sizeInBytesExcluding: (NSHashTable*)exclude { NSUInteger size = GSPrivateMemorySize(self, exclude); @@ -408,7 +408,7 @@ static GC_descr nodeDesc; // Type descriptor for map node. while (node != 0) { node = GSIMapEnumeratorNextNode(&enumerator); - size += [node->key.obj sizeInBytes: exclude]; + size += [node->key.obj sizeInBytesExcluding: exclude]; } GSIMapEndEnumerator(&enumerator); } diff --git a/Source/GSSet.m b/Source/GSSet.m index 7d6e51016..e8a5ed062 100644 --- a/Source/GSSet.m +++ b/Source/GSSet.m @@ -538,7 +538,7 @@ static Class mutableSetClass; (&map, state, stackbuf, len); } -- (NSUInteger) sizeInBytes: (NSHashTable*)exclude +- (NSUInteger) sizeInBytesExcluding: (NSHashTable*)exclude { NSUInteger size = GSPrivateMemorySize(self, exclude); @@ -551,7 +551,7 @@ static Class mutableSetClass; while (node != 0) { node = GSIMapEnumeratorNextNode(&enumerator); - size += [node->key.obj sizeInBytes: exclude]; + size += [node->key.obj sizeInBytesExcluding: exclude]; } GSIMapEndEnumerator(&enumerator); }