Skip to content
This repository
Browse code

Fix 32-bit Mac build failure

Previous commit used an undeclared ivar in an @synthesize.
This is legal in the new runtime but not the old (32-bit Mac) one.
  • Loading branch information...
commit 0f372450adad5e1931883c74bcf306f43d4c3f38 1 parent 92dfeeb
Jens Alfke snej authored
2  Couch/CouchQuery.h
@@ -35,7 +35,7 @@ typedef enum {
35 35 NSString* _startKeyDocID;
36 36 NSString* _endKeyDocID;
37 37 CouchStaleness _stale;
38   - BOOL _descending, _prefetch, _sequences, _includeDeleted;
  38 + BOOL _descending, _prefetch, _sequences, _includeDeleted, _mapOnly;
39 39 NSArray *_keys;
40 40 NSUInteger _groupLevel;
41 41 NSError* _error;
2  Couch/CouchQuery.m
@@ -74,7 +74,7 @@ - (void) dealloc
74 74
75 75
76 76 @synthesize limit=_limit, skip=_skip, descending=_descending, startKey=_startKey, endKey=_endKey,
77   - prefetch=_prefetch, keys=_keys, mapOnly = _mapOnly, groupLevel=_groupLevel, startKeyDocID=_startKeyDocID,
  77 + prefetch=_prefetch, keys=_keys, mapOnly=_mapOnly, groupLevel=_groupLevel, startKeyDocID=_startKeyDocID,
78 78 endKeyDocID=_endKeyDocID, stale=_stale, sequences=_sequences,
79 79 includeDeleted=_includeDeleted, error=_error;
80 80
6 CouchCocoa.xcodeproj/project.pbxproj
@@ -1103,6 +1103,8 @@
1103 1103 isa = XCBuildConfiguration;
1104 1104 buildSettings = {
1105 1105 ARCHS = "$(ARCHS_STANDARD_32_64_BIT)";
  1106 + CLANG_WARN_OBJC_MISSING_PROPERTY_SYNTHESIS = YES;
  1107 + CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
1106 1108 CURRENT_PROJECT_VERSION = 14;
1107 1109 GCC_C_LANGUAGE_STANDARD = gnu99;
1108 1110 GCC_OPTIMIZATION_LEVEL = 0;
@@ -1112,6 +1114,7 @@
1112 1114 GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
1113 1115 GCC_WARN_ABOUT_MISSING_PROTOTYPES = YES;
1114 1116 GCC_WARN_ABOUT_RETURN_TYPE = YES;
  1117 + GCC_WARN_UNDECLARED_SELECTOR = YES;
1115 1118 GCC_WARN_UNUSED_VARIABLE = YES;
1116 1119 IPHONEOS_DEPLOYMENT_TARGET = 5.0;
1117 1120 MACOSX_DEPLOYMENT_TARGET = 10.7;
@@ -1126,6 +1129,8 @@
1126 1129 isa = XCBuildConfiguration;
1127 1130 buildSettings = {
1128 1131 ARCHS = "$(ARCHS_STANDARD_32_64_BIT)";
  1132 + CLANG_WARN_OBJC_MISSING_PROPERTY_SYNTHESIS = YES;
  1133 + CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
1129 1134 CURRENT_PROJECT_VERSION = 14;
1130 1135 GCC_C_LANGUAGE_STANDARD = gnu99;
1131 1136 GCC_PRECOMPILE_PREFIX_HEADER = YES;
@@ -1134,6 +1139,7 @@
1134 1139 GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
1135 1140 GCC_WARN_ABOUT_MISSING_PROTOTYPES = YES;
1136 1141 GCC_WARN_ABOUT_RETURN_TYPE = YES;
  1142 + GCC_WARN_UNDECLARED_SELECTOR = YES;
1137 1143 GCC_WARN_UNUSED_VARIABLE = YES;
1138 1144 IPHONEOS_DEPLOYMENT_TARGET = 5.0;
1139 1145 MACOSX_DEPLOYMENT_TARGET = 10.7;

0 comments on commit 0f37245

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