* Remove objc/Protocol.h include from NSObject to avoid warnings

with conflicting method signatures.
* Headers/Foundation/NSConnection.h: Change Object categories
to NSObject.
* Source/NSConnection.m: Idem.
* Headers/Foundation/NSObject.h: Don't include objc/Protocol.h
add a few missing things.
* Source/NSDate.m ([NSDate -isEqual:]): Use isKindOfClass.
* Source/NSDistantObject.m, Source/NSProtocolChecker.m:
Include objc/Protocol.h
* Source/NSSerializer.m: Add method sig for performv::


git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/base/trunk@21322 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Adam Fedor 2005-06-17 14:51:57 +00:00
parent 234b69e5ab
commit f0512c406e
8 changed files with 27 additions and 5 deletions

View file

@ -1,3 +1,17 @@
2005-06-17 Adam Fedor <fedor@gnu.org>
* Remove objc/Protocol.h include from NSObject to avoid warnings
with conflicting method signatures.
* Headers/Foundation/NSConnection.h: Change Object categories
to NSObject.
* Source/NSConnection.m: Idem.
* Headers/Foundation/NSObject.h: Don't include objc/Protocol.h
add a few missing things.
* Source/NSDate.m ([NSDate -isEqual:]): Use isKindOfClass.
* Source/NSDistantObject.m, Source/NSProtocolChecker.m:
Include objc/Protocol.h
* Source/NSSerializer.m: Add method sig for performv::
2005-06-15 Richard Frith-Macdonald <rfm@gnu.org>
* Documentation/manual/WorkingWithObjects.texi: Correct errors in

View file

@ -215,7 +215,7 @@ GS_EXPORT NSString* const NSConnectionProxyCount; /* Objects received */
@end
@interface Object (NSConnectionDelegate)
@interface NSObject (NSConnectionDelegate)
/**
* This method may be used to ask a delegate's permission to create
* a new connection from the old one.
@ -265,7 +265,7 @@ GS_EXPORT NSString* const NSConnectionProxyCount; /* Objects received */
* This informal protocol allows an object to control the details of how an
* object is sent over the wire in distributed objects Port communications.
*/
@interface Object (NSPortCoder)
@interface NSObject (NSPortCoder)
/**
* Must return the class that will be created on the remote side
* of the connection. If the class to be created is not the same

View file

@ -101,7 +101,7 @@
#include <GNUstepBase/preface.h>
#include <GSConfig.h>
#include <objc/objc.h>
#include <objc/Protocol.h>
#include <objc/typedstream.h>
#include <Foundation/NSZone.h>
@class NSArchiver;
@ -369,6 +369,7 @@ enum {NSNotFound = 0x7fffffff};
GS_EXPORT NSRecursiveLock *gnustep_global_lock;
@interface NSObject (GNUstep)
- (BOOL) isInstance;
- (id) makeImmutableCopyOnFail: (BOOL)force;
- (Class) transmuteClassTo: (Class)aClassObject;
+ (Class) autoreleaseClass;

View file

@ -3592,7 +3592,7 @@ static void callEncoder (DOContext *ctxt)
* delegates may conform ... implementing these methods has the effect
* documented.
*/
@implementation Object (NSConnectionDelegate)
@implementation NSObject (NSConnectionDelegate)
/**
* <p>
* This is not an NSConnection method, but is a method that may

View file

@ -1334,7 +1334,7 @@ GSTimeNow(void)
{
if (other == nil)
return NO;
if ([other isKindOf: abstractClass]
if ([other isKindOfClass: abstractClass]
&& 1.0 > ABS(otherTime(self) - otherTime(other)))
return YES;
return NO;

View file

@ -36,6 +36,7 @@
#include "Foundation/NSException.h"
#include "Foundation/NSObjCRuntime.h"
#include "Foundation/NSInvocation.h"
#include <objc/Protocol.h>
#define DO_FORWARD_INVOCATION(_SELX, _ARG1) ({ \
sig = [self methodSignatureForSelector: @selector(_SELX)]; \

View file

@ -32,6 +32,7 @@
#include "Foundation/NSException.h"
#include "Foundation/NSInvocation.h"
#include "Foundation/NSMethodSignature.h"
#include <objc/Protocol.h>
/**
* The NSProtocolChecker and NSProxy classes provide message filtering and

View file

@ -142,6 +142,11 @@ static SEL lenSel;
static SEL serSel;
static SEL setSel;
/* Compatibility methods from NEXTSTEP (Implemented in NSObject) */
@interface NSObject (Serializer)
- (retval_t) performv: (SEL)aSel :(arglist_t)argFrame;
@end
static void
initSerializerInfo(_NSSerializerInfo* info, NSMutableData *d, BOOL u)
{