Support building with older sdks that don't define NS_DESIGNATED_INIT…

…IALIZER Work around an issue with older versions of clang: ( r203954 - Objective-C. Allow objc_designated_initializer for private ) http://permalink.gmane.org/gmane.comp.compilers.clang.scm/94822
heardrwt · Jul 14, 2014 · 5abb3ca · 5abb3ca
1 parent f1d8ff3
commit 5abb3ca
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 2 deletions.
diff --git a/RHAddressBook.xcodeproj/project.pbxproj b/RHAddressBook.xcodeproj/project.pbxproj
@@ -708,6 +708,7 @@
 				GCC_PREFIX_HEADER = "RHAddressBookTester/RHAddressBookTester-Prefix.pch";
 				GCC_THUMB_SUPPORT = NO;
 				INFOPLIST_FILE = "RHAddressBookTester/RHAddressBookTester-Info.plist";
+				IPHONEOS_DEPLOYMENT_TARGET = 5.1.1;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
 				OTHER_LDFLAGS = "-ObjC";
 				PRODUCT_NAME = "$(TARGET_NAME)";
@@ -727,6 +728,7 @@
 				GCC_PREFIX_HEADER = "RHAddressBookTester/RHAddressBookTester-Prefix.pch";
 				GCC_THUMB_SUPPORT = NO;
 				INFOPLIST_FILE = "RHAddressBookTester/RHAddressBookTester-Info.plist";
+				IPHONEOS_DEPLOYMENT_TARGET = 5.1.1;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
 				OTHER_CFLAGS = "-DNS_BLOCK_ASSERTIONS=1";
 				OTHER_LDFLAGS = "-ObjC";
@@ -955,6 +957,7 @@
 				13D1519E193E7688003B0F45 /* Release */,
 			);
 			defaultConfigurationIsVisible = 0;
+			defaultConfigurationName = Release;
 		};
 /* End XCConfigurationList section */
 	};

diff --git a/RHAddressBook/RHAddressBook.h b/RHAddressBook/RHAddressBook.h
@@ -41,6 +41,14 @@
     #define RH_AB_INCLUDE_GEOCODING 0
 #endif
 
+//support building with older sdks that don't define NS_DESIGNATED_INITIALIZER
+#ifndef NS_DESIGNATED_INITIALIZER
+    #if __has_attribute(objc_designated_initializer)
+        #define NS_DESIGNATED_INITIALIZER __attribute__((objc_designated_initializer))
+    #else
+        #define NS_DESIGNATED_INITIALIZER
+    #endif
+#endif
 
 @class RHRecord;
 @class RHSource;

diff --git a/RHAddressBook/RHMultiValue.h b/RHAddressBook/RHMultiValue.h
@@ -30,7 +30,7 @@
 
 #import <Foundation/Foundation.h>
 #import <AddressBook/AddressBook.h>
-
+#import "RHAddressBook.h"
 
 @class RHMultiValue;
 @class RHMutableMultiValue;

diff --git a/RHAddressBook/RHRecord_Private.h b/RHAddressBook/RHRecord_Private.h
@@ -36,7 +36,7 @@
 @interface RHRecord ()
 
 //init (you should not call init on these objects yourself. instead use the [RHAddressBook newPerson] method)
--(instancetype)initWithAddressBook:(RHAddressBook*)addressBook recordRef:(ABRecordRef)recordRef NS_DESIGNATED_INITIALIZER;
+-(instancetype)initWithAddressBook:(RHAddressBook*)addressBook recordRef:(ABRecordRef)recordRef /* NS_DESIGNATED_INITIALIZER (Xcode5: see http://permalink.gmane.org/gmane.comp.compilers.clang.scm/94822) */;
 
 @end