Update to Xcode 4.6 & iOS 6.1 recommended settings

cppforlife · Jan 31, 2013 · 18e1574 · 18e1574
1 parent be5355d
commit 18e1574
Show file tree

Hide file tree

Showing 6 changed files with 22 additions and 8 deletions.
diff --git a/Cedar.xcodeproj/project.pbxproj b/Cedar.xcodeproj/project.pbxproj
@@ -1393,7 +1393,7 @@
 		AEEE1FA611DC26EA00029872 /* Project object */ = {
 			isa = PBXProject;
 			attributes = {
-				LastUpgradeCheck = 0440;
+				LastUpgradeCheck = 0460;
 			};
 			buildConfigurationList = AEEE1FA911DC26EA00029872 /* Build configuration list for PBXProject "Cedar" */;
 			compatibilityVersion = "Xcode 3.2";
@@ -2025,10 +2025,17 @@
 				ARCHS = "$(ARCHS_STANDARD_32_64_BIT)";
 				CLANG_CXX_LANGUAGE_STANDARD = "c++0x";
 				CLANG_CXX_LIBRARY = "libc++";
+				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_TREAT_WARNINGS_AS_ERRORS = YES;
 				GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
 				GCC_WARN_ABOUT_MISSING_NEWLINE = YES;
+				GCC_WARN_ABOUT_RETURN_TYPE = YES;
+				GCC_WARN_UNINITIALIZED_AUTOS = YES;
+				GCC_WARN_UNUSED_VARIABLE = YES;
 				IPHONEOS_DEPLOYMENT_TARGET = 5.0;
 				OTHER_CPLUSPLUSFLAGS = (
 					"$(OTHER_CFLAGS)",
@@ -2044,10 +2051,17 @@
 				ARCHS = "$(ARCHS_STANDARD_32_64_BIT)";
 				CLANG_CXX_LANGUAGE_STANDARD = "c++0x";
 				CLANG_CXX_LIBRARY = "libc++";
+				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;
 				GCC_TREAT_WARNINGS_AS_ERRORS = YES;
 				GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
 				GCC_WARN_ABOUT_MISSING_NEWLINE = YES;
+				GCC_WARN_ABOUT_RETURN_TYPE = YES;
+				GCC_WARN_UNINITIALIZED_AUTOS = YES;
+				GCC_WARN_UNUSED_VARIABLE = YES;
 				IPHONEOS_DEPLOYMENT_TARGET = 5.0;
 				OTHER_CPLUSPLUSFLAGS = (
 					"$(OTHER_CFLAGS)",

diff --git a/Rakefile b/Rakefile
@@ -15,7 +15,7 @@ SNIPPET_SENTINEL_VALUE = "isCedarSnippet"
 XCODE_TEMPLATES_DIR = "#{ENV['HOME']}/Library/Developer/Xcode/Templates"
 XCODE_SNIPPETS_DIR = "#{ENV['HOME']}/Library/Developer/Xcode/UserData/CodeSnippets"
 
-SDK_VERSION = "6.0"
+SDK_VERSION = "6.1"
 PROJECT_ROOT = File.dirname(__FILE__)
 BUILD_DIR = File.join(PROJECT_ROOT, "build")
 TEMPLATES_DIR = File.join(PROJECT_ROOT, "CodeSnippetsAndTemplates", "Templates")

diff --git a/Source/CDRExampleGroup.m b/Source/CDRExampleGroup.m
@@ -44,10 +44,9 @@ - (CDRSpecBlock)subjectActionBlock {
     CDRSpecBlock parentsubjectActionBlock = self.parent.subjectActionBlock;
     if (subjectActionBlock_) {
         if (parentsubjectActionBlock) {
-            [[NSException exceptionWithName:NSInternalInconsistencyException
-                                     reason:[NSString stringWithFormat:@"%@ has more than one subject action block", self]
-                                   userInfo:nil]
-             raise];
+            @throw([NSException exceptionWithName:NSInternalInconsistencyException
+                                           reason:[NSString stringWithFormat:@"%@ has more than one subject action block", self]
+                                         userInfo:nil]);
         } else {
             return subjectActionBlock_;
         }

diff --git a/Source/Doubles/CDRSpy.mm b/Source/Doubles/CDRSpy.mm
@@ -99,7 +99,7 @@ - (NSArray *)sent_messages {
 }
 
 - (void)reset_sent_messages {
-    return self.cedar_double_impl.reset_sent_messages;
+    [self.cedar_double_impl reset_sent_messages];
 }
 
 #pragma mark - Private interface

diff --git a/Source/Doubles/CedarDouble.mm b/Source/Doubles/CedarDouble.mm
@@ -15,7 +15,7 @@
     }
 
     void operator,(id<CedarDouble> double_instance, const StubbedMethod & stubbed_method) {
-        return [double_instance add_stub:stubbed_method];
+        [double_instance add_stub:stubbed_method];
     }
 
 }}
diff --git a/Source/Doubles/CedarDoubleImpl.mm b/Source/Doubles/CedarDoubleImpl.mm
@@ -16,6 +16,7 @@ @implementation CedarDoubleImpl
 
 - (id)init {
     [super doesNotRecognizeSelector:_cmd];
+    return nil;
 }
 
 - (id)initWithDouble:(NSObject<CedarDouble> *)parent_double {