Convert Class* to Class.():

git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/base/trunk@59 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Andrew McCallum 1995-01-26 17:55:52 +00:00
parent 530172b775
commit 19367a527e
5 changed files with 74 additions and 16 deletions

View file

@ -56,8 +56,8 @@ my_object_is_class(id object)
&& CLS_ISMETA(((Class)object)->isa)
&& ((Class)object)->isa != ((Class)object)->isa)
#else
&& CLS_ISMETA(((Class*)object)->class_pointer)
&& ((Class*)object)->class_pointer != ((Class*)object)->class_pointer)
&& CLS_ISMETA(((Class)object)->class_pointer)
&& ((Class)object)->class_pointer != ((Class)object)->class_pointer)
#endif
return YES;
else

View file

@ -1,8 +1,31 @@
/* Implementation of NSObject for GNUStep
Copyright (C) 1994, 1995 Free Software Foundation, Inc.
Written by: R. Andrew McCallum <mccallum@gnu.ai.mit.edu>
Date: August 1994
This file is part of the GNU Objective C Class Library.
This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Library General Public
License as published by the Free Software Foundation; either
version 2 of the License, or (at your option) any later version.
This library is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
Library General Public License for more details.
You should have received a copy of the GNU Library General Public
License along with this library; if not, write to the Free
Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
#include <objects/stdobjects.h>
#include <foundation/NSObject.h>
#include <foundation/NSMethodSignature.h>
#include <foundation/NSArchiver.h>
#include <foundation/NSCoder.h>
// #include <foundation/NSMethodSignature.h>
// #include <foundation/NSArchiver.h>
// #include <foundation/NSCoder.h>
@implementation NSObject
@ -36,6 +59,12 @@
return object_dispose(self);
}
- free
{
[self error:"Use `dealloc' instead of `free'."];
return nil;
}
- (id) init
{
return self;
@ -100,6 +129,11 @@
return nil;
}
- (BOOL) isProxy
{
return NO;
}
+ (NSString*) description
{
return nil;
@ -152,7 +186,7 @@
return;
}
- (id) awakAfterUsingCoder: (NSCoder*)aDecoder
- (id) awakeAfterUsingCoder: (NSCoder*)aDecoder
{
return self;
}
@ -179,4 +213,28 @@
@end
#endif /* __NSNSObject_h_INCLUDE_GNU */
NSObject *NSAllocateObject(Class aClass, unsigned extraBytes, NSZone *zone)
{
}
void NSDeallocateObject(NSObject *anObject)
{
}
NSObject *NSCopyObject(NSObject *anObject, unsigned extraBytes, NSZone *zone)
{
}
BOOL NSShouldRetainWithZone(NSObject *anObject, NSZone *requestedZone)
{
}
void NSIncrementExtraRefCount(id anObject)
{
}
BOOL NSDecrementExtraRefCountWasZero(id anObject)
{
}

View file

@ -26,7 +26,7 @@
#include <objects/ConnectedCoder.h>
#include <assert.h>
static Class* NXConnectionProxyClass;
static Class NXConnectionProxyClass;
/* Just to make -encodeRemotelyFor:... work */
@interface NXConnectedCoder : ConnectedCoder
@ -54,13 +54,13 @@ static Class* NXConnectionProxyClass;
return self;
}
+ setDefaultProxyClass: (Class*)aClass
+ setDefaultProxyClass: (Class)aClass
{
NXConnectionProxyClass = aClass;
return self;
}
+ (Class*) defaultProxyClass
+ (Class) defaultProxyClass
{
return NXConnectionProxyClass;
}
@ -223,13 +223,13 @@ static Class* NXConnectionProxyClass;
return [self setRootObject:anObj];
}
- (Class*) proxyClass
- (Class) proxyClass
{
/* we might replace this with a per-Connection proxy class. */
return NXConnectionProxyClass;
}
- (Class*) coderClass
- (Class) coderClass
{
return [NXConnectedCoder class];
}

View file

@ -96,9 +96,9 @@ static id tmp_kludge_protocol = nil;
return self;
}
#else
+ (Class*) class
+ (Class) class
{
return (Class*)self;
return (Class)self;
}
#endif

View file

@ -72,7 +72,7 @@ objc_sizeof_type(const char* type)
break;
case _C_CLASS:
return sizeof(Class*);
return sizeof(Class);
break;
case _C_SEL:
@ -179,7 +179,7 @@ objc_alignof_type(const char* type)
break;
case _C_CLASS:
return __alignof__(Class*);
return __alignof__(Class);
break;
case _C_SEL: