Skip to content
Browse files

ARC

  • Loading branch information...
1 parent 6416929 commit b5c382ffe66004839fb49f93bdf0f0f13ff34810 @schwa schwa committed
View
15 Source/CDataScanner.m
@@ -72,16 +72,14 @@ + (void)initialize
{
if (sDoubleCharacters == NULL)
{
- sDoubleCharacters = [[NSCharacterSet characterSetWithCharactersInString:@"0123456789eE-+."] retain];
+ sDoubleCharacters = [NSCharacterSet characterSetWithCharactersInString:@"0123456789eE-+."];
}
}
- (void)dealloc
{
- [data release];
data = NULL;
//
- [super dealloc];
}
- (NSUInteger)scanLocation
@@ -103,8 +101,7 @@ - (void)setData:(NSData *)inData
{
if (data != inData)
{
- [data release];
- data = [inData retain];
+ data = inData;
}
if (data)
@@ -200,7 +197,7 @@ - (BOOL)scanCharactersFromSet:(NSCharacterSet *)inSet intoString:(NSString **)ou
if (outValue)
{
- *outValue = [[[NSString alloc] initWithBytes:current length:P - current encoding:NSUTF8StringEncoding] autorelease];
+ *outValue = [[NSString alloc] initWithBytes:current length:P - current encoding:NSUTF8StringEncoding];
}
current = P;
@@ -219,7 +216,7 @@ - (BOOL)scanUpToString:(NSString *)inString intoString:(NSString **)outValue
if (outValue)
{
- *outValue = [[[NSString alloc] initWithBytes:current length:theResult - (char *)current encoding:NSUTF8StringEncoding] autorelease];
+ *outValue = [[NSString alloc] initWithBytes:current length:theResult - (char *)current encoding:NSUTF8StringEncoding];
}
current = (u_int8_t *)theResult;
@@ -240,7 +237,7 @@ - (BOOL)scanUpToCharactersFromSet:(NSCharacterSet *)inSet intoString:(NSString *
if (outValue)
{
- *outValue = [[[NSString alloc] initWithBytes:current length:P - current encoding:NSUTF8StringEncoding] autorelease];
+ *outValue = [[NSString alloc] initWithBytes:current length:P - current encoding:NSUTF8StringEncoding];
}
current = P;
@@ -325,7 +322,7 @@ - (void)skipWhitespace
- (NSString *)remainingString
{
NSData *theRemainingData = [NSData dataWithBytes:current length:end - current];
- NSString *theString = [[[NSString alloc] initWithData:theRemainingData encoding:NSUTF8StringEncoding] autorelease];
+ NSString *theString = [[NSString alloc] initWithData:theRemainingData encoding:NSUTF8StringEncoding];
return(theString);
}
View
16 Source/Experimental/CFilteringJSONSerializer.m
@@ -13,16 +13,6 @@ @implementation CFilteringJSONSerializer
@synthesize tests;
@synthesize convertersByName;
-- (void)dealloc
- {
- [tests release];
- tests = NULL;
- //
- [convertersByName release];
- convertersByName = NULL;
- //
- [super dealloc];
- }
- (NSData *)serializeObject:(id)inObject error:(NSError **)outError
{
@@ -69,16 +59,16 @@ - (NSData *)serializeObject:(id)inObject error:(NSError **)outError
- (void)addTest:(JSONConversionTest)inTest
{
- inTest = [[inTest copy] autorelease];
+ inTest = [inTest copy];
NSSet *theTests = [self.tests setByAddingObject:inTest];
self.tests = theTests;
}
- (void)addConverter:(JSONConversionConverter)inConverter forName:(NSString *)inName
{
- NSMutableDictionary *theConvertersByName = [[self.convertersByName mutableCopy] autorelease];
+ NSMutableDictionary *theConvertersByName = [self.convertersByName mutableCopy];
- inConverter = [[inConverter copy] autorelease];
+ inConverter = [inConverter copy];
[theConvertersByName setObject:inConverter forKey:inName];
self.convertersByName = theConvertersByName;
}
View
10 Source/Experimental/CJSONSerializedData.m
@@ -21,19 +21,11 @@ - (id)initWithData:(NSData *)inData
{
if ((self = [super init]) != NULL)
{
- data = [inData retain];
+ data = inData;
}
return(self);
}
-- (void)dealloc
- {
- [data release];
- data = NULL;
- //
- [super dealloc];
- }
-
- (NSData *)serializedJSONData
{
return(self.data);
View
4 Source/Extensions/CDataScanner_Extensions.m
@@ -119,8 +119,8 @@ - (NSDictionary *)userInfoForScanLocation
NSString *theSnippet = [NSString stringWithFormat:@"%@!HERE>!%@",
- [[[NSString alloc] initWithData:[self.data subdataWithRange:theStartRange] encoding:NSUTF8StringEncoding] autorelease],
- [[[NSString alloc] initWithData:[self.data subdataWithRange:theEndRange] encoding:NSUTF8StringEncoding] autorelease]
+ [[NSString alloc] initWithData:[self.data subdataWithRange:theStartRange] encoding:NSUTF8StringEncoding],
+ [[NSString alloc] initWithData:[self.data subdataWithRange:theEndRange] encoding:NSUTF8StringEncoding]
];
NSDictionary *theUserInfo = [NSDictionary dictionaryWithObjectsAndKeys:
View
9 Source/JSON/CJSONDeserializer.m
@@ -44,7 +44,7 @@ @implementation CJSONDeserializer
+ (CJSONDeserializer *)deserializer
{
- return([[[self alloc] init] autorelease]);
+ return([[self alloc] init]);
}
- (id)init
@@ -55,13 +55,6 @@ - (id)init
return(self);
}
-- (void)dealloc
- {
- [scanner release];
- scanner = NULL;
- //
- [super dealloc];
- }
#pragma mark -
View
47 Source/JSON/CJSONScanner.m
@@ -79,18 +79,11 @@ - (id)init
if ((self = [super init]) != NULL)
{
strictEscapeCodes = NO;
- nullObject = [[NSNull null] retain];
+ nullObject = [NSNull null];
}
return(self);
}
-- (void)dealloc
- {
- [nullObject release];
- nullObject = NULL;
- //
- [super dealloc];
- }
#pragma mark -
@@ -123,7 +116,6 @@ - (BOOL)setData:(NSData *)inData error:(NSError **)outError;
theString = [[NSString alloc] initWithData:theData encoding:self.allowedEncoding];
}
theData = [theString dataUsingEncoding:NSUTF8StringEncoding];
- [theString release];
}
if (theData)
@@ -252,7 +244,6 @@ - (BOOL)scanJSONDictionary:(NSDictionary **)outDictionary error:(NSError **)outE
{
*outError = [self error:kJSONScannerErrorCode_DictionaryKeyScanFailed description:@"Could not scan dictionary. Failed to scan a key."];
}
- [theDictionary release];
return(NO);
}
@@ -265,7 +256,6 @@ - (BOOL)scanJSONDictionary:(NSDictionary **)outDictionary error:(NSError **)outE
{
*outError = [self error:kJSONScannerErrorCode_DictionaryKeyNotTerminated description:@"Could not scan dictionary. Key was not terminated with a ':' character."];
}
- [theDictionary release];
return(NO);
}
@@ -277,7 +267,6 @@ - (BOOL)scanJSONDictionary:(NSDictionary **)outDictionary error:(NSError **)outE
{
*outError = [self error:kJSONScannerErrorCode_DictionaryValueScanFailed description:@"Could not scan dictionary. Failed to scan a value."];
}
- [theDictionary release];
return(NO);
}
@@ -300,7 +289,6 @@ - (BOOL)scanJSONDictionary:(NSDictionary **)outDictionary error:(NSError **)outE
{
*outError = [self error:kJSONScannerErrorDomain description:@"kJSONScannerErrorCode_DictionaryKeyValuePairNoDelimiter"];
}
- [theDictionary release];
return(NO);
}
break;
@@ -320,7 +308,6 @@ - (BOOL)scanJSONDictionary:(NSDictionary **)outDictionary error:(NSError **)outE
{
*outError = [self error:kJSONScannerErrorCode_DictionaryNotTerminated description:@"Could not scan dictionary. Dictionary not terminated by a '}' character."];
}
- [theDictionary release];
return(NO);
}
@@ -328,17 +315,15 @@ - (BOOL)scanJSONDictionary:(NSDictionary **)outDictionary error:(NSError **)outE
{
if (self.options & kJSONScannerOptions_MutableContainers)
{
- *outDictionary = [theDictionary autorelease];
+ *outDictionary = theDictionary;
}
else
{
- *outDictionary = [[theDictionary copy] autorelease];
- [theDictionary release];
+ *outDictionary = [theDictionary copy];
}
}
else
{
- [theDictionary release];
}
return(YES);
@@ -377,7 +362,6 @@ - (BOOL)scanJSONArray:(NSArray **)outArray error:(NSError **)outError
[theUserInfo addEntriesFromDictionary:self.userInfoForScanLocation];
*outError = [NSError errorWithDomain:kJSONScannerErrorDomain code:kJSONScannerErrorCode_ArrayValueScanFailed userInfo:theUserInfo];
}
- [theArray release];
return(NO);
}
@@ -389,7 +373,6 @@ - (BOOL)scanJSONArray:(NSArray **)outArray error:(NSError **)outError
{
*outError = [self error:kJSONScannerErrorCode_ArrayValueIsNull description:@"Could not scan array. Value is NULL."];
}
- [theArray release];
return(NO);
}
}
@@ -409,7 +392,6 @@ - (BOOL)scanJSONArray:(NSArray **)outArray error:(NSError **)outError
{
*outError = [self error:kJSONScannerErrorCode_ArrayNotTerminated description:@"Could not scan array. Array not terminated by a ']' character."];
}
- [theArray release];
return(NO);
}
@@ -427,7 +409,6 @@ - (BOOL)scanJSONArray:(NSArray **)outArray error:(NSError **)outError
{
*outError = [self error:kJSONScannerErrorCode_ArrayNotTerminated description:@"Could not scan array. Array not terminated by a ']' character."];
}
- [theArray release];
return(NO);
}
@@ -435,17 +416,15 @@ - (BOOL)scanJSONArray:(NSArray **)outArray error:(NSError **)outError
{
if (self.options & kJSONScannerOptions_MutableContainers)
{
- *outArray = [theArray autorelease];
+ *outArray = theArray;
}
else
{
- *outArray = [[theArray copy] autorelease];
- [theArray release];
+ *outArray = [theArray copy];
}
}
else
{
- [theArray release];
}
return(YES);
}
@@ -465,7 +444,6 @@ - (BOOL)scanJSONStringConstant:(NSString **)outStringConstant error:(NSError **)
{
*outError = [self error:kJSONScannerErrorCode_StringNotStartedWithBackslash description:@"Could not scan string constant. String not started by a '\"' character."];
}
- [theString release];
return(NO);
}
@@ -474,7 +452,7 @@ - (BOOL)scanJSONStringConstant:(NSString **)outStringConstant error:(NSError **)
NSString *theStringChunk = NULL;
if ([self scanNotQuoteCharactersIntoString:&theStringChunk])
{
- CFStringAppend((CFMutableStringRef)theString, (CFStringRef)theStringChunk);
+ CFStringAppend((CFMutableStringRef)objc_unretainedPointer(theString), (CFStringRef)objc_unretainedPointer(theStringChunk));
}
else if ([self scanCharacter:'\\'] == YES)
{
@@ -515,7 +493,6 @@ - (BOOL)scanJSONStringConstant:(NSString **)outStringConstant error:(NSError **)
{
*outError = [self error:kJSONScannerErrorCode_StringUnicodeNotDecoded description:@"Could not scan string constant. Unicode character could not be decoded."];
}
- [theString release];
return(NO);
}
theCharacter |= (theDigit << theShift);
@@ -531,13 +508,12 @@ - (BOOL)scanJSONStringConstant:(NSString **)outStringConstant error:(NSError **)
{
*outError = [self error:kJSONScannerErrorCode_StringUnknownEscapeCode description:@"Could not scan string constant. Unknown escape code."];
}
- [theString release];
return(NO);
}
}
break;
}
- CFStringAppendCharacters((CFMutableStringRef)theString, &theCharacter, 1);
+ CFStringAppendCharacters((CFMutableStringRef)objc_unretainedPointer(theString), &theCharacter, 1);
}
else
{
@@ -545,7 +521,6 @@ - (BOOL)scanJSONStringConstant:(NSString **)outStringConstant error:(NSError **)
{
*outError = [self error:kJSONScannerErrorCode_StringNotTerminated description:@"Could not scan string constant. No terminating double quote character."];
}
- [theString release];
return(NO);
}
}
@@ -554,17 +529,15 @@ - (BOOL)scanJSONStringConstant:(NSString **)outStringConstant error:(NSError **)
{
if (self.options & kJSONScannerOptions_MutableLeaves)
{
- *outStringConstant = [theString autorelease];
+ *outStringConstant = theString;
}
else
{
- *outStringConstant = [[theString copy] autorelease];
- [theString release];
+ *outStringConstant = [theString copy];
}
}
else
{
- [theString release];
}
return(YES);
@@ -617,7 +590,7 @@ - (BOOL)scanNotQuoteCharactersIntoString:(NSString **)outValue
if (outValue)
{
- *outValue = [[[NSString alloc] initWithBytes:current length:P - current encoding:NSUTF8StringEncoding] autorelease];
+ *outValue = [[NSString alloc] initWithBytes:current length:P - current encoding:NSUTF8StringEncoding];
}
current = P;
View
8 Source/JSON/CJSONSerializer.m
@@ -39,7 +39,6 @@ @implementation CJSONSerializer
+ (void)initialize
{
- NSAutoreleasePool *thePool = [[NSAutoreleasePool alloc] init];
if (self == [CJSONSerializer class])
{
@@ -50,13 +49,12 @@ + (void)initialize
if (kTrue == NULL)
kTrue = [[NSData alloc] initWithBytesNoCopy:(void *)"true" length:4 freeWhenDone:NO];
- [thePool release];
}
}
+ (CJSONSerializer *)serializer
{
- return([[[self alloc] init] autorelease]);
+ return([[self alloc] init]);
}
- (BOOL)isValidJSONObject:(id)inObject
@@ -121,7 +119,7 @@ - (NSData *)serializeObject:(id)inObject error:(NSError **)outError
}
else if ([inObject isKindOfClass:[NSData class]])
{
- NSString *theString = [[[NSString alloc] initWithData:inObject encoding:NSUTF8StringEncoding] autorelease];
+ NSString *theString = [[NSString alloc] initWithData:inObject encoding:NSUTF8StringEncoding];
theResult = [self serializeString:theString error:outError];
}
else if ([inObject respondsToSelector:@selector(JSONDataRepresentation)])
@@ -163,7 +161,7 @@ - (NSData *)serializeNumber:(NSNumber *)inNumber error:(NSError **)outError
{
#pragma unused (outError)
NSData *theResult = NULL;
- switch (CFNumberGetType((CFNumberRef)inNumber))
+ switch (CFNumberGetType((CFNumberRef)objc_unretainedPointer(inNumber)))
{
case kCFNumberCharType:
{
View
10 Support/Demo/main.m
@@ -42,13 +42,13 @@ int main(int argc, char **argv)
{
#pragma unused(argc, argv)
- NSAutoreleasePool *theAutoreleasePool = [[NSAutoreleasePool alloc] init];
+ @autoreleasepool {
// test();
// test_twitter_public_timeline();
test_repeated_array();
- [theAutoreleasePool release];
+ }
//
return(0);
}
@@ -61,7 +61,7 @@ static void test(void)
// NSData *theData = [@"\"\u062a\u062d\u064a\u0627 \u0645\u0635\u0631!\"" dataUsingEncoding:NSUTF8StringEncoding];
NSString *theString = [[CJSONDeserializer deserializer] deserialize:theData error:&theError];
theData = [[CJSONSerializer serializer] serializeObject:theString error:&theError];
- theString = [[[NSString alloc] initWithData:theData encoding:NSUTF8StringEncoding] autorelease];
+ theString = [[NSString alloc] initWithData:theData encoding:NSUTF8StringEncoding];
NSLog(@"%@", theString);
}
@@ -73,7 +73,7 @@ static void test_repeated_array(void)
NSError *theError = NULL;
NSData *theData = [[CJSONSerializer serializer] serializeObject:array error:&theError];
- NSString *theString = [[[NSString alloc] initWithData:theData encoding:NSUTF8StringEncoding] autorelease];
+ NSString *theString = [[NSString alloc] initWithData:theData encoding:NSUTF8StringEncoding];
NSLog(@"%@", theString);
}
@@ -89,7 +89,7 @@ static void test_twitter_public_timeline(void)
NSLog(@"%@", jsonData);
NSLog(@"JSON data: %ld (Error: %@)", jsonData.length, theError);
- NSString *jsonString = [[[NSString alloc] initWithData:jsonData encoding:NSUTF8StringEncoding] autorelease];
+ NSString *jsonString = [[NSString alloc] initWithData:jsonData encoding:NSUTF8StringEncoding];
NSLog(@"JSON string: %ld", jsonString.length);
NSLog(@"> %@", jsonString);
}
View
16 Support/NewBenchmark/TouchJSONBenchmark.m
@@ -12,9 +12,15 @@
#import "CJSONDeserializer.h"
int main (int argc, const char * argv[])
- {
- NSAutoreleasePool * pool = [[NSAutoreleasePool alloc] init];
+{
+@autoreleasepool {
+ NSDictionary *theDictionary = [NSDictionary dictionaryWithObjectsAndKeys:
+ @"Hello", @"World",
+ NULL];
+
+ CJSONSerializer *theSerializer = [CJSONSerializer serializer];
+ CJSONDeserializer *theDeserializer = [CJSONDeserializer deserializer];
NSDictionary *theDictionary = [NSDictionary dictionaryWithObjectsAndKeys:
@"Hello", @"World",
@@ -41,11 +47,9 @@ int main (int argc, const char * argv[])
- CFAbsoluteTime theEnd = CFAbsoluteTimeGetCurrent();
-
NSLog(@"%g", theEnd - theStart);
- [pool drain];
- return 0;
}
+return 0;
+}
View
2 Support/NewBenchmark/TouchJSONBenchmark.xcodeproj/project.pbxproj
@@ -148,7 +148,7 @@
path = Extensions;
sourceTree = "<group>";
};
- 459A1F5313DB5296004E9CFE /* JSON */ = {
+ 45DEF06113A17FE3002E95B9 /* JSON */ = {
isa = PBXGroup;
children = (
459A1F5413DB5296004E9CFE /* CJSONDeserializer.h */,
View
34 Support/TouchJSON.xcodeproj/project.pbxproj
@@ -3,7 +3,7 @@
archiveVersion = 1;
classes = {
};
- objectVersion = 42;
+ objectVersion = 46;
objects = {
/* Begin PBXAggregateTarget section */
@@ -288,8 +288,11 @@
/* Begin PBXProject section */
29B97313FDCFA39411CA2CEA /* Project object */ = {
isa = PBXProject;
+ attributes = {
+ LastUpgradeCheck = 0420;
+ };
buildConfigurationList = 45FC538608FBF91C0091ABDF /* Build configuration list for PBXProject "TouchJSON" */;
- compatibilityVersion = "Xcode 2.4";
+ compatibilityVersion = "Xcode 3.2";
developmentRegion = English;
hasScannedForEncodings = 1;
knownRegions = (
@@ -402,7 +405,6 @@
buildSettings = {
COPY_PHASE_STRIP = YES;
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
- GCC_ENABLE_FIX_AND_CONTINUE = NO;
PRODUCT_NAME = All;
ZERO_LINK = NO;
};
@@ -411,16 +413,17 @@
453111B80A64EDDE00A970C2 /* Debug */ = {
isa = XCBuildConfiguration;
buildSettings = {
+ CLANG_ENABLE_OBJC_ARC = YES;
COPY_PHASE_STRIP = NO;
GCC_C_LANGUAGE_STANDARD = gnu99;
GCC_DYNAMIC_NO_PIC = NO;
- GCC_ENABLE_FIX_AND_CONTINUE = YES;
GCC_GENERATE_DEBUGGING_SYMBOLS = YES;
GCC_MODEL_TUNING = G5;
GCC_OPTIMIZATION_LEVEL = 0;
GCC_PRECOMPILE_PREFIX_HEADER = YES;
GCC_PREFIX_HEADER = "$(SYSTEM_LIBRARY_DIR)/Frameworks/AppKit.framework/Headers/AppKit.h";
GCC_TREAT_WARNINGS_AS_ERRORS = NO;
+ GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
GCC_WARN_ABOUT_MISSING_NEWLINE = YES;
GCC_WARN_ABOUT_MISSING_PROTOTYPES = YES;
GCC_WARN_ABOUT_RETURN_TYPE = YES;
@@ -444,7 +447,6 @@
"-framework",
AppKit,
);
- PREBINDING = NO;
PRODUCT_NAME = "TouchJSON Demo";
ZERO_LINK = YES;
};
@@ -453,16 +455,17 @@
453111B90A64EDDE00A970C2 /* Release */ = {
isa = XCBuildConfiguration;
buildSettings = {
+ CLANG_ENABLE_OBJC_ARC = YES;
COPY_PHASE_STRIP = YES;
GCC_C_LANGUAGE_STANDARD = gnu99;
GCC_DYNAMIC_NO_PIC = YES;
- GCC_ENABLE_FIX_AND_CONTINUE = NO;
GCC_GENERATE_DEBUGGING_SYMBOLS = NO;
GCC_MODEL_TUNING = G5;
GCC_OPTIMIZATION_LEVEL = s;
GCC_PRECOMPILE_PREFIX_HEADER = YES;
GCC_PREFIX_HEADER = "$(SYSTEM_LIBRARY_DIR)/Frameworks/AppKit.framework/Headers/AppKit.h";
GCC_TREAT_WARNINGS_AS_ERRORS = NO;
+ GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
GCC_WARN_ABOUT_MISSING_NEWLINE = YES;
GCC_WARN_ABOUT_MISSING_PROTOTYPES = YES;
GCC_WARN_ABOUT_RETURN_TYPE = YES;
@@ -486,7 +489,6 @@
"-framework",
AppKit,
);
- PREBINDING = NO;
PRODUCT_NAME = "TouchJSON Demo";
ZERO_LINK = NO;
};
@@ -502,7 +504,6 @@
);
GCC_C_LANGUAGE_STANDARD = gnu99;
GCC_DYNAMIC_NO_PIC = NO;
- GCC_ENABLE_FIX_AND_CONTINUE = NO;
GCC_ENABLE_OBJC_EXCEPTIONS = YES;
GCC_GENERATE_DEBUGGING_SYMBOLS = YES;
GCC_MODEL_TUNING = G5;
@@ -517,7 +518,6 @@
"-framework",
SenTestingKit,
);
- PREBINDING = NO;
PRODUCT_NAME = UnitTests;
WRAPPER_EXTENSION = octest;
ZERO_LINK = NO;
@@ -532,7 +532,6 @@
"$(value)",
"$(DEVELOPER_FRAMEWORKS_DIR_QUOTED)",
);
- GCC_ENABLE_FIX_AND_CONTINUE = NO;
GCC_ENABLE_OBJC_EXCEPTIONS = YES;
GCC_GENERATE_DEBUGGING_SYMBOLS = NO;
GCC_MODEL_TUNING = G5;
@@ -546,7 +545,6 @@
"-framework",
SenTestingKit,
);
- PREBINDING = NO;
PRODUCT_NAME = UnitTests;
WRAPPER_EXTENSION = octest;
ZERO_LINK = NO;
@@ -556,12 +554,13 @@
45FC538708FBF91C0091ABDF /* Debug */ = {
isa = XCBuildConfiguration;
buildSettings = {
- ARCHS = "$(ONLY_ACTIVE_ARCH_PRE_XCODE_3_1)";
+ ARCHS = "$(ARCHS_STANDARD_32_64_BIT)";
GCC_C_LANGUAGE_STANDARD = c99;
GCC_TREAT_WARNINGS_AS_ERRORS = YES;
GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
GCC_WARN_ABOUT_MISSING_FIELD_INITIALIZERS = YES;
GCC_WARN_ABOUT_MISSING_NEWLINE = YES;
+ GCC_WARN_ABOUT_MISSING_PROTOTYPES = YES;
GCC_WARN_ABOUT_RETURN_TYPE = YES;
GCC_WARN_CHECK_SWITCH_STATEMENTS = YES;
GCC_WARN_INITIALIZER_NOT_FULLY_BRACKETED = YES;
@@ -574,21 +573,22 @@
GCC_WARN_UNUSED_LABEL = YES;
GCC_WARN_UNUSED_VALUE = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
- ONLY_ACTIVE_ARCH_PRE_XCODE_3_1 = "$(NATIVE_ARCH_ACTUAL)";
+ ONLY_ACTIVE_ARCH = YES;
RUN_CLANG_STATIC_ANALYZER = YES;
- SDKROOT = "$(DEVELOPER_SDK_DIR)/MacOSX10.6.sdk";
+ SDKROOT = macosx;
};
name = Debug;
};
45FC538808FBF91C0091ABDF /* Release */ = {
isa = XCBuildConfiguration;
buildSettings = {
- ARCHS = "$(ONLY_ACTIVE_ARCH_PRE_XCODE_3_1)";
+ ARCHS = "$(ARCHS_STANDARD_32_64_BIT)";
GCC_C_LANGUAGE_STANDARD = c99;
GCC_TREAT_WARNINGS_AS_ERRORS = YES;
GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
GCC_WARN_ABOUT_MISSING_FIELD_INITIALIZERS = YES;
GCC_WARN_ABOUT_MISSING_NEWLINE = YES;
+ GCC_WARN_ABOUT_MISSING_PROTOTYPES = YES;
GCC_WARN_ABOUT_RETURN_TYPE = YES;
GCC_WARN_CHECK_SWITCH_STATEMENTS = YES;
GCC_WARN_INITIALIZER_NOT_FULLY_BRACKETED = YES;
@@ -601,9 +601,9 @@
GCC_WARN_UNUSED_LABEL = YES;
GCC_WARN_UNUSED_VALUE = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
- ONLY_ACTIVE_ARCH_PRE_XCODE_3_1 = "$(NATIVE_ARCH_ACTUAL)";
+ ONLY_ACTIVE_ARCH = YES;
RUN_CLANG_STATIC_ANALYZER = YES;
- SDKROOT = "$(DEVELOPER_SDK_DIR)/MacOSX10.6.sdk";
+ SDKROOT = macosx;
};
name = Release;
};

0 comments on commit b5c382f

Please sign in to comment.
Something went wrong with that request. Please try again.