Fix Mac build issue on OSX10.9 and XCode 6.0

couchbase · Apr 16, 2015 · 67e591b · 67e591b
1 parent 5c80e70
commit 67e591b
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/Source/API/Extras/CBLIncrementalStore.m b/Source/API/Extras/CBLIncrementalStore.m
@@ -276,7 +276,7 @@ -(BOOL) loadMetadata: (NSError**)outError {
 
 #if !TARGET_OS_IPHONE
 #if (__MAC_OS_X_VERSION_MIN_REQUIRED >= 1070)
-                if (rel.ordered)
+                if (rel.isOrdered)
                     WARN(@"'%@' entity has an ordered to-many relationship '%@', which is not supported "
                          "by the CBLIncrementalStore.", entity.name, rel.name);
 #endif
@@ -1068,7 +1068,7 @@ - (NSString*) scanKeyPathExpression: (NSExpression*)expression
         BOOL needJoins = NO;
         if ([propertyDesc isKindOfClass:[NSRelationshipDescription class]]) {
             NSRelationshipDescription* rel = (NSRelationshipDescription*)propertyDesc;
-            needJoins = hasDotAccess || rel.toMany;
+            needJoins = hasDotAccess || rel.isToMany;
         }
         if (outNeedJoinsQuery)
             *outNeedJoinsQuery = needJoins;

diff --git a/Unit-Tests/Replication_Tests.m b/Unit-Tests/Replication_Tests.m
@@ -560,19 +560,19 @@ - (void) test10_ReplicationCookie {
                withValue: cookie1.value
                     path: cookie1.path
           expirationDate: cookie1.expiresDate
-                  secure: cookie1.secure];
+                  secure: cookie1.isSecure];
 
     [repl setCookieNamed: cookie2.name
                withValue: cookie2.value
                     path: cookie2.path
           expirationDate: cookie2.expiresDate
-                  secure: cookie2.secure];
+                  secure: cookie2.isSecure];
 
     [repl setCookieNamed: cookie3.name
                withValue: cookie3.value
                     path: cookie3.path
           expirationDate: cookie3.expiresDate
-                  secure: cookie3.secure];
+                  secure: cookie3.isSecure];
 
     [repl deleteCookieNamed: cookie2.name];