mirror of
https://github.com/gnustep/libs-base.git
synced 2025-05-31 08:41:03 +00:00
* 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:
parent
2b660f6c78
commit
1cb435da9a
8 changed files with 27 additions and 5 deletions
|
@ -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
|
||||
|
|
|
@ -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;
|
||||
|
|
|
@ -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)]; \
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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)
|
||||
{
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue