Permalink
Browse files

Small fixes to project settings for OS X.

  • Loading branch information...
1 parent c1b6d8c commit c3aae376760580995ead4f02f050c19611533a3f @logancollins committed Apr 11, 2013
Showing with 11 additions and 11 deletions.
  1. +9 −1 Mocha.xcodeproj/project.pbxproj
  2. +2 −10 Mocha/Utilities/MOUtilities.m
@@ -1001,7 +1001,7 @@
isa = PBXProject;
attributes = {
CLASSPREFIX = MO;
- LastUpgradeCheck = 0450;
+ LastUpgradeCheck = 0460;
ORGANIZATIONNAME = "Sunflower Softworks";
};
buildConfigurationList = EAA45DFC155CE44B00F93E40 /* Build configuration list for PBXProject "Mocha" */;
@@ -1403,6 +1403,10 @@
ALWAYS_SEARCH_USER_PATHS = NO;
ARCHS = "$(ARCHS_STANDARD_64_BIT)";
CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
+ CLANG_WARN_CONSTANT_CONVERSION = YES;
+ CLANG_WARN_ENUM_CONVERSION = YES;
+ CLANG_WARN_INT_CONVERSION = YES;
+ CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
COPY_PHASE_STRIP = NO;
GCC_C_LANGUAGE_STANDARD = gnu99;
GCC_DYNAMIC_NO_PIC = NO;
@@ -1432,6 +1436,10 @@
ALWAYS_SEARCH_USER_PATHS = NO;
ARCHS = "$(ARCHS_STANDARD_64_BIT)";
CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
+ CLANG_WARN_CONSTANT_CONVERSION = YES;
+ CLANG_WARN_ENUM_CONVERSION = YES;
+ CLANG_WARN_INT_CONVERSION = YES;
+ CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
COPY_PHASE_STRIP = YES;
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
GCC_C_LANGUAGE_STANDARD = gnu99;
@@ -287,14 +287,12 @@ JSValueRef MOFunctionInvoke(id function, JSContextRef ctx, size_t argumentCount,
selector = [function selector];
Class klass = [target class];
- #if TARGET_OS_IPHONE
- // iOS has no NSDistantObject
- #else
+#if !TARGET_OS_IPHONE
// Override for Distributed Objects
if ([klass isSubclassOfClass:[NSDistantObject class]]) {
return MOSelectorInvoke(target, selector, ctx, argumentCount, arguments, exception);
}
- #endif
+#endif
// Override for Allocators
if (selector == @selector(alloc)
@@ -310,12 +308,6 @@ JSValueRef MOFunctionInvoke(id function, JSContextRef ctx, size_t argumentCount,
target = [[target objectClass] alloc];
}
- // Make sure autorelease is ignored, since we do our own reference counting.
- if (selector == NSSelectorFromString(@"autorelease")) {
- NSLog(@"Ignoring autorelease call on %@", target);
- return [runtime JSValueForObject:target];
- }
-
Method method = NULL;
BOOL classMethod = (target == klass);

0 comments on commit c3aae37

Please sign in to comment.