Merge pull request apache#20 from khawkins/unstable

Fixing iOS 7.1 errors (64-bit)
khawkins · Mar 25, 2014 · b81252f · b81252f
2 parents e4c7ba2 + efba91c
commit b81252f
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/CordovaLib/Classes/JSON/JSONKit.m b/CordovaLib/Classes/JSON/JSONKit.m
@@ -677,7 +677,7 @@ + (id)allocWithZone:(NSZone *)zone
   NSCParameterAssert((objects != NULL) && (_CDVJKArrayClass != NULL) && (_CDVJKArrayInstanceSize > 0UL));
   CDVJKArray *array = NULL;
   if(CDVJK_EXPECT_T((array = (CDVJKArray *)calloc(1UL, _CDVJKArrayInstanceSize)) != NULL)) { // Directly allocate the CDVJKArray instance via calloc.
-    array->isa      = _CDVJKArrayClass;
+    object_setClass(array, _CDVJKArrayClass);
     if((array = [array init]) == NULL) { return(NULL); }
     array->capacity = count;
     array->count    = count;
@@ -928,7 +928,7 @@ static void _CDVJKDictionaryResizeIfNeccessary(CDVJKDictionary *dictionary) {
   NSCParameterAssert((keys != NULL) && (keyHashes != NULL) && (objects != NULL) && (_CDVJKDictionaryClass != NULL) && (_CDVJKDictionaryInstanceSize > 0UL));
   CDVJKDictionary *dictionary = NULL;
   if(CDVJK_EXPECT_T((dictionary = (CDVJKDictionary *)calloc(1UL, _CDVJKDictionaryInstanceSize)) != NULL)) { // Directly allocate the CDVJKDictionary instance via calloc.
-    dictionary->isa      = _CDVJKDictionaryClass;
+    object_setClass(dictionary, _CDVJKDictionaryClass);
     if((dictionary = [dictionary init]) == NULL) { return(NULL); }
     dictionary->capacity = _CDVJKDictionaryCapacityForCount(count);
     dictionary->count    = 0UL;