mirror of
https://github.com/gnustep/libs-base.git
synced 2025-05-30 08:21:25 +00:00
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:
parent
efd4799f93
commit
d81b9725a6
5 changed files with 74 additions and 16 deletions
|
@ -56,8 +56,8 @@ my_object_is_class(id object)
|
||||||
&& CLS_ISMETA(((Class)object)->isa)
|
&& CLS_ISMETA(((Class)object)->isa)
|
||||||
&& ((Class)object)->isa != ((Class)object)->isa)
|
&& ((Class)object)->isa != ((Class)object)->isa)
|
||||||
#else
|
#else
|
||||||
&& CLS_ISMETA(((Class*)object)->class_pointer)
|
&& CLS_ISMETA(((Class)object)->class_pointer)
|
||||||
&& ((Class*)object)->class_pointer != ((Class*)object)->class_pointer)
|
&& ((Class)object)->class_pointer != ((Class)object)->class_pointer)
|
||||||
#endif
|
#endif
|
||||||
return YES;
|
return YES;
|
||||||
else
|
else
|
||||||
|
|
|
@ -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 <objects/stdobjects.h>
|
||||||
#include <foundation/NSObject.h>
|
#include <foundation/NSObject.h>
|
||||||
#include <foundation/NSMethodSignature.h>
|
// #include <foundation/NSMethodSignature.h>
|
||||||
#include <foundation/NSArchiver.h>
|
// #include <foundation/NSArchiver.h>
|
||||||
#include <foundation/NSCoder.h>
|
// #include <foundation/NSCoder.h>
|
||||||
|
|
||||||
@implementation NSObject
|
@implementation NSObject
|
||||||
|
|
||||||
|
@ -36,6 +59,12 @@
|
||||||
return object_dispose(self);
|
return object_dispose(self);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
- free
|
||||||
|
{
|
||||||
|
[self error:"Use `dealloc' instead of `free'."];
|
||||||
|
return nil;
|
||||||
|
}
|
||||||
|
|
||||||
- (id) init
|
- (id) init
|
||||||
{
|
{
|
||||||
return self;
|
return self;
|
||||||
|
@ -100,6 +129,11 @@
|
||||||
return nil;
|
return nil;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
- (BOOL) isProxy
|
||||||
|
{
|
||||||
|
return NO;
|
||||||
|
}
|
||||||
|
|
||||||
+ (NSString*) description
|
+ (NSString*) description
|
||||||
{
|
{
|
||||||
return nil;
|
return nil;
|
||||||
|
@ -152,7 +186,7 @@
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
- (id) awakAfterUsingCoder: (NSCoder*)aDecoder
|
- (id) awakeAfterUsingCoder: (NSCoder*)aDecoder
|
||||||
{
|
{
|
||||||
return self;
|
return self;
|
||||||
}
|
}
|
||||||
|
@ -179,4 +213,28 @@
|
||||||
|
|
||||||
@end
|
@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)
|
||||||
|
{
|
||||||
|
}
|
||||||
|
|
|
@ -26,7 +26,7 @@
|
||||||
#include <objects/ConnectedCoder.h>
|
#include <objects/ConnectedCoder.h>
|
||||||
#include <assert.h>
|
#include <assert.h>
|
||||||
|
|
||||||
static Class* NXConnectionProxyClass;
|
static Class NXConnectionProxyClass;
|
||||||
|
|
||||||
/* Just to make -encodeRemotelyFor:... work */
|
/* Just to make -encodeRemotelyFor:... work */
|
||||||
@interface NXConnectedCoder : ConnectedCoder
|
@interface NXConnectedCoder : ConnectedCoder
|
||||||
|
@ -54,13 +54,13 @@ static Class* NXConnectionProxyClass;
|
||||||
return self;
|
return self;
|
||||||
}
|
}
|
||||||
|
|
||||||
+ setDefaultProxyClass: (Class*)aClass
|
+ setDefaultProxyClass: (Class)aClass
|
||||||
{
|
{
|
||||||
NXConnectionProxyClass = aClass;
|
NXConnectionProxyClass = aClass;
|
||||||
return self;
|
return self;
|
||||||
}
|
}
|
||||||
|
|
||||||
+ (Class*) defaultProxyClass
|
+ (Class) defaultProxyClass
|
||||||
{
|
{
|
||||||
return NXConnectionProxyClass;
|
return NXConnectionProxyClass;
|
||||||
}
|
}
|
||||||
|
@ -223,13 +223,13 @@ static Class* NXConnectionProxyClass;
|
||||||
return [self setRootObject:anObj];
|
return [self setRootObject:anObj];
|
||||||
}
|
}
|
||||||
|
|
||||||
- (Class*) proxyClass
|
- (Class) proxyClass
|
||||||
{
|
{
|
||||||
/* we might replace this with a per-Connection proxy class. */
|
/* we might replace this with a per-Connection proxy class. */
|
||||||
return NXConnectionProxyClass;
|
return NXConnectionProxyClass;
|
||||||
}
|
}
|
||||||
|
|
||||||
- (Class*) coderClass
|
- (Class) coderClass
|
||||||
{
|
{
|
||||||
return [NXConnectedCoder class];
|
return [NXConnectedCoder class];
|
||||||
}
|
}
|
||||||
|
|
|
@ -96,9 +96,9 @@ static id tmp_kludge_protocol = nil;
|
||||||
return self;
|
return self;
|
||||||
}
|
}
|
||||||
#else
|
#else
|
||||||
+ (Class*) class
|
+ (Class) class
|
||||||
{
|
{
|
||||||
return (Class*)self;
|
return (Class)self;
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
|
|
@ -72,7 +72,7 @@ objc_sizeof_type(const char* type)
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case _C_CLASS:
|
case _C_CLASS:
|
||||||
return sizeof(Class*);
|
return sizeof(Class);
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case _C_SEL:
|
case _C_SEL:
|
||||||
|
@ -179,7 +179,7 @@ objc_alignof_type(const char* type)
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case _C_CLASS:
|
case _C_CLASS:
|
||||||
return __alignof__(Class*);
|
return __alignof__(Class);
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case _C_SEL:
|
case _C_SEL:
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue