Author: rfm
Date: Wed Mar 9 14:35:20 2016
New Revision: 39495
URL: http://svn.gna.org/viewcvs/gnustep?rev=39495&view=rev
Log:
Make test work when GS_GENERIC_CLASS is not defined.
Modified:
libs/base/trunk/Tests/base/NSPredicate/basic.m
Modified: libs/base/trunk/Tests/base/NSPredicate/basic.m
URL:
http://svn.gna.org/viewcvs/gnustep/libs/base/trunk/Tests/base/NSPredicate/basic.m?rev=39495&r1=39494&r2=39495&view=diff
==============================================================================
--- libs/base/trunk/Tests/base/NSPredicate/basic.m (original)
+++ libs/base/trunk/Tests/base/NSPredicate/basic.m Wed Mar 9 14:35:20 2016
@@ -109,16 +109,17 @@
NSPredicate *p = nil;
NSPredicate *p2 = nil;
# if __has_feature(blocks)
- p = [NSPredicate predicateWithBlock: ^BOOL(id obj,
- GS_GENERIC_CLASS(NSDictionary,NSString*,id)* bindings){
- NSString *key = [bindings objectForKey: @"Key"];
- if (nil == key)
- {
- key = @"Record1";
- }
- NSString *value = [[obj objectForKey: key] objectForKey: @"Name"];
- return [value isEqualToString: @"John"];
- }];
+ p = [NSPredicate predicateWithBlock: ^BOOL(id obj, NSDictionary *bindings)
+ {
+ NSString *key = [bindings objectForKey: @"Key"];
+
+ if (nil == key)
+ {
+ key = @"Record1";
+ }
+ NSString *value = [[obj objectForKey: key] objectForKey: @"Name"];
+ return [value isEqualToString: @"John"];
+ }];
PASS([p evaluateWithObject: dict], "BLOCKPREDICATE() without bindings");
p2 = [p predicateWithSubstitutionVariables:
[NSDictionary dictionaryWithObjectsAndKeys: @"Record2", @"Key", nil]];
_______________________________________________
Gnustep-cvs mailing list
[email protected]
https://mail.gna.org/listinfo/gnustep-cvs
