From 292ae660487fe279f290cf1a8753d6b676d523ab Mon Sep 17 00:00:00 2001 From: rfm Date: Wed, 10 Jul 2013 14:17:59 +0000 Subject: [PATCH] add code to compare types ignoring qualifiers git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/base/trunk@36864 72102866-910b-0410-8b05-ffd578937521 --- Source/NSInvocationOperation.m | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/Source/NSInvocationOperation.m b/Source/NSInvocationOperation.m index 80ceebf9f..2a7a20287 100644 --- a/Source/NSInvocationOperation.m +++ b/Source/NSInvocationOperation.m @@ -32,6 +32,7 @@ #import "Foundation/NSInvocation.h" #import "Foundation/NSMethodSignature.h" #import "Foundation/NSValue.h" +#import "GNUstepBase/GSObjCRuntime.h" @implementation NSInvocationOperation @@ -97,12 +98,14 @@ { const char *returnType = [[_invocation methodSignature] methodReturnType]; - if (0 == strncmp(@encode(void), returnType, 1)) + if (0 == strncmp(@encode(void), + GSSkipTypeQualifierAndLayoutInfo(returnType), 1)) { [NSException raise: (id)NSInvocationOperationVoidResultException format: @"*** %s: void result", __PRETTY_FUNCTION__]; } - else if (0 == strncmp(@encode(id), returnType, 1)) + else if (0 == strncmp(@encode(id), + GSSkipTypeQualifierAndLayoutInfo(returnType), 1)) { [_invocation getReturnValue: &result]; }