From e3422df5216cb004799701f4fd0bbb27ecd3e45b Mon Sep 17 00:00:00 2001 From: Andrew McCallum Date: Sun, 3 Mar 1996 00:33:24 +0000 Subject: [PATCH] ([Enumerator -nextObject]): Pass pointer to ENUM_STATE. ([Enumerator -dealloc]): Likewise. ([ConstantCollection -detectObjectByInvoking:]): Use -returnValueIsTrue. ([ConstantCollection -printForDebugger]): Use object_get_class_name instead of -name because -name is now ambiguously typed. git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/base/trunk@1032 72102866-910b-0410-8b05-ffd578937521 --- Source/Collection.m | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/Source/Collection.m b/Source/Collection.m index 6d2e03c6c..9e1106ac1 100644 --- a/Source/Collection.m +++ b/Source/Collection.m @@ -40,12 +40,12 @@ - nextObject { - return [collection nextObjectWithEnumState: enum_state]; + return [collection nextObjectWithEnumState: &enum_state]; } - (void) dealloc { - [collection freeEnumState: enum_state]; + [collection freeEnumState: &enum_state]; [collection release]; } @@ -305,7 +305,8 @@ FOR_COLLECTION_WHILE_TRUE(self, o, flag) { - if ([anInvocation invokeWithObject: o]) + [anInvocation invokeWithObject: o]; + if ([anInvocation returnValueIsTrue]) { flag = NO; detectedObject = o; @@ -593,7 +594,7 @@ printf("%s ", [[o description] cStringNoCopy]); } END_FOR_COLLECTION(self); - printf(": %s\n", [self name]); + printf(": %s\n", object_get_class_name (self)); return self; }