Merge branch 'develop'

Simperium · Oct 31, 2013 · b784ea9 · b784ea9
2 parents 9b6848e + 95f9891
commit b784ea9
Show file tree

Hide file tree

Showing 189 changed files with 8,282 additions and 7,829 deletions.
diff --git a/External/JSONKit/JSONKit.m b/External/JSONKit/JSONKit.m
@@ -677,7 +677,7 @@ + (id)allocWithZone:(NSZone *)zone
   NSCParameterAssert((objects != NULL) && (_JKArrayClass != NULL) && (_JKArrayInstanceSize > 0UL));
   JKArray *array = NULL;
   if(JK_EXPECT_T((array = (JKArray *)calloc(1UL, _JKArrayInstanceSize)) != NULL)) { // Directly allocate the JKArray instance via calloc.
-    array->isa      = _JKArrayClass;
+    object_setClass(array, _JKArrayClass);
     if((array = [array init]) == NULL) { return(NULL); }
     array->capacity = count;
     array->count    = count;
@@ -928,7 +928,7 @@ static void _JKDictionaryResizeIfNeccessary(JKDictionary *dictionary) {
   NSCParameterAssert((keys != NULL) && (keyHashes != NULL) && (objects != NULL) && (_JKDictionaryClass != NULL) && (_JKDictionaryInstanceSize > 0UL));
   JKDictionary *dictionary = NULL;
   if(JK_EXPECT_T((dictionary = (JKDictionary *)calloc(1UL, _JKDictionaryInstanceSize)) != NULL)) { // Directly allocate the JKDictionary instance via calloc.
-    dictionary->isa      = _JKDictionaryClass;
+    object_setClass(dictionary, _JKDictionaryClass);
     if((dictionary = [dictionary init]) == NULL) { return(NULL); }
     dictionary->capacity = _JKDictionaryCapacityForCount(count);
     dictionary->count    = 0UL;

diff --git a/External/Lumberjack/DDASLLogger.h b/External/Lumberjack/DDASLLogger.h
diff --git a/External/Lumberjack/DDASLLogger.m b/External/Lumberjack/DDASLLogger.m
@@ -76,15 +76,15 @@ - (void)logMessage:(DDLogMessage *)logMessage
 		const char *msg = [logMsg UTF8String];
 
 		int aslLogLevel;
-		switch (logMessage->logLevel)
+		switch (logMessage->logFlag)
 		{
 			// Note: By default ASL will filter anything above level 5 (Notice).
 			// So our mappings shouldn't go above that level.
 
-			case 1  : aslLogLevel = ASL_LEVEL_CRIT;    break;
-			case 2  : aslLogLevel = ASL_LEVEL_ERR;     break;
-			case 3  : aslLogLevel = ASL_LEVEL_WARNING; break;
-			default : aslLogLevel = ASL_LEVEL_NOTICE;  break;
+			case LOG_FLAG_ERROR : aslLogLevel = ASL_LEVEL_CRIT;    break;
+			case LOG_FLAG_WARN  : aslLogLevel = ASL_LEVEL_ERR;     break;
+			case LOG_FLAG_INFO  : aslLogLevel = ASL_LEVEL_WARNING; break;
+			default             : aslLogLevel = ASL_LEVEL_NOTICE;  break;
 		}
 
 		asl_log(client, NULL, aslLogLevel, "%s", msg);

diff --git a/External/Lumberjack/DDAbstractDatabaseLogger.h b/External/Lumberjack/DDAbstractDatabaseLogger.h