From 1cb435da9a0891299db19bfdad429bdfe9d13f92 Mon Sep 17 00:00:00 2001 From: fedor Date: Fri, 17 Jun 2005 14:51:57 +0000 Subject: [PATCH] * 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 --- ChangeLog | 14 ++++++++++++++ Headers/Foundation/NSConnection.h | 4 ++-- Headers/Foundation/NSObject.h | 3 ++- Source/NSConnection.m | 2 +- Source/NSDate.m | 2 +- Source/NSDistantObject.m | 1 + Source/NSProtocolChecker.m | 1 + Source/NSSerializer.m | 5 +++++ 8 files changed, 27 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index e20b7ecf0..703f506f5 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,17 @@ +2005-06-17 Adam Fedor + + * 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 * Documentation/manual/WorkingWithObjects.texi: Correct errors in diff --git a/Headers/Foundation/NSConnection.h b/Headers/Foundation/NSConnection.h index 5ca0f934e..2d0fe9309 100644 --- a/Headers/Foundation/NSConnection.h +++ b/Headers/Foundation/NSConnection.h @@ -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 diff --git a/Headers/Foundation/NSObject.h b/Headers/Foundation/NSObject.h index 7ec21d9aa..91088c1cf 100644 --- a/Headers/Foundation/NSObject.h +++ b/Headers/Foundation/NSObject.h @@ -101,7 +101,7 @@ #include #include #include -#include +#include #include @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; diff --git a/Source/NSConnection.m b/Source/NSConnection.m index a95bc73e0..8e8dbda6a 100644 --- a/Source/NSConnection.m +++ b/Source/NSConnection.m @@ -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) /** *

* This is not an NSConnection method, but is a method that may diff --git a/Source/NSDate.m b/Source/NSDate.m index 81909decf..d3426a236 100644 --- a/Source/NSDate.m +++ b/Source/NSDate.m @@ -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; diff --git a/Source/NSDistantObject.m b/Source/NSDistantObject.m index 2ae49c055..be035b00a 100644 --- a/Source/NSDistantObject.m +++ b/Source/NSDistantObject.m @@ -36,6 +36,7 @@ #include "Foundation/NSException.h" #include "Foundation/NSObjCRuntime.h" #include "Foundation/NSInvocation.h" +#include #define DO_FORWARD_INVOCATION(_SELX, _ARG1) ({ \ sig = [self methodSignatureForSelector: @selector(_SELX)]; \ diff --git a/Source/NSProtocolChecker.m b/Source/NSProtocolChecker.m index b6f9a8bb0..33df06a55 100644 --- a/Source/NSProtocolChecker.m +++ b/Source/NSProtocolChecker.m @@ -32,6 +32,7 @@ #include "Foundation/NSException.h" #include "Foundation/NSInvocation.h" #include "Foundation/NSMethodSignature.h" +#include /** * The NSProtocolChecker and NSProxy classes provide message filtering and diff --git a/Source/NSSerializer.m b/Source/NSSerializer.m index 7382ea3d1..9ac99a6af 100644 --- a/Source/NSSerializer.m +++ b/Source/NSSerializer.m @@ -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) {