diff --git a/SOPE/GDLContentStore/EOQualifier+GCS.m b/SOPE/GDLContentStore/EOQualifier+GCS.m index 255525ed7..15d54a9d6 100644 --- a/SOPE/GDLContentStore/EOQualifier+GCS.m +++ b/SOPE/GDLContentStore/EOQualifier+GCS.m @@ -27,10 +27,6 @@ #import "EOQualifier+GCS.h" -#if __GNU_LIBOBJC__ >= 20100911 -# define sel_eq(__A__,__B__) sel_isEqual(__A__,__B__) -#endif - @implementation EOQualifier(GCS) - (void)_appendAndQualifier:(EOAndQualifier *)_q @@ -92,21 +88,21 @@ val = [_q value]; if (val && [val isNotNull]) { - if (sel_eq(op, EOQualifierOperatorEqual)) + if (sel_isEqual(op, EOQualifierOperatorEqual)) qOperator = @"="; - else if (sel_eq(op, EOQualifierOperatorNotEqual)) + else if (sel_isEqual(op, EOQualifierOperatorNotEqual)) qOperator = @"!="; - else if (sel_eq(op, EOQualifierOperatorLessThan)) + else if (sel_isEqual(op, EOQualifierOperatorLessThan)) qOperator = @"<"; - else if (sel_eq(op, EOQualifierOperatorGreaterThan)) + else if (sel_isEqual(op, EOQualifierOperatorGreaterThan)) qOperator = @">"; - else if (sel_eq(op, EOQualifierOperatorLessThanOrEqualTo)) + else if (sel_isEqual(op, EOQualifierOperatorLessThanOrEqualTo)) qOperator = @"<="; - else if (sel_eq(op, EOQualifierOperatorGreaterThanOrEqualTo)) + else if (sel_isEqual(op, EOQualifierOperatorGreaterThanOrEqualTo)) qOperator = @">="; - else if (sel_eq(op, EOQualifierOperatorLike)) + else if (sel_isEqual(op, EOQualifierOperatorLike)) qOperator = @"LIKE"; - else if (sel_eq(op, EOQualifierOperatorCaseInsensitiveLike)) { + else if (sel_isEqual(op, EOQualifierOperatorCaseInsensitiveLike)) { isCI = YES; qOperator = @"LIKE"; } @@ -128,11 +124,11 @@ } } else { - if (sel_eq(op, EOQualifierOperatorEqual)) { + if (sel_isEqual(op, EOQualifierOperatorEqual)) { qOperator = @"IS"; qValue = @"NULL"; } - else if (sel_eq(op, EOQualifierOperatorNotEqual)) { + else if (sel_isEqual(op, EOQualifierOperatorNotEqual)) { qOperator = @"IS NOT"; qValue = @"NULL"; } diff --git a/SOPE/GDLContentStore/GCSFolder.m b/SOPE/GDLContentStore/GCSFolder.m index af49f91ce..8002b67cb 100644 --- a/SOPE/GDLContentStore/GCSFolder.m +++ b/SOPE/GDLContentStore/GCSFolder.m @@ -44,10 +44,6 @@ #import "EOQualifier+GCS.h" #import "GCSStringFormatter.h" -#if __GNU_LIBOBJC__ >= 20100911 -# define sel_eq(__A__,__B__) sel_isEqual(__A__,__B__) -#endif - typedef enum { noTableRequired = 0, quickTableRequired = 1, @@ -395,20 +391,20 @@ static GCSStringFormatter *stringFormatter = nil; if (i > 0) [sql appendString:@", "]; - if (sel_eq(sel, EOCompareAscending)) { + if (sel_isEqual(sel, EOCompareAscending)) { [sql appendString:column]; [sql appendString:@" ASC"]; } - else if (sel_eq(sel, EOCompareDescending)) { + else if (sel_isEqual(sel, EOCompareDescending)) { [sql appendString:column]; [sql appendString:@" DESC"]; } - else if (sel_eq(sel, EOCompareCaseInsensitiveAscending)) { + else if (sel_isEqual(sel, EOCompareCaseInsensitiveAscending)) { [sql appendString:@"UPPER("]; [sql appendString:column]; [sql appendString:@") ASC"]; } - else if (sel_eq(sel, EOCompareCaseInsensitiveDescending)) { + else if (sel_isEqual(sel, EOCompareCaseInsensitiveDescending)) { [sql appendString:@"UPPER("]; [sql appendString:column]; [sql appendString:@") DESC"];