Skip to content

Commit 978463b

Browse files
authored
Merge pull request ReactiveCocoa#3156 from ReactiveCocoa/update-xcconfigs
Update xcconfigs
2 parents 84f2f7a + 4fe5913 commit 978463b

File tree

5 files changed

+4
-12
lines changed

5 files changed

+4
-12
lines changed

Cartfile.private

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
github "jspahrsummers/xcconfigs" "1ef9763"
1+
github "jspahrsummers/xcconfigs" "3d9d996"
22
github "norio-nomura/Quick" "nn-swift-3-compatibility"
33
github "norio-nomura/Nimble" "nn-swift-3-compatibility"

Cartfile.resolved

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
github "norio-nomura/Nimble" "3d82a185b49e8fc9f40e7b72feeb279c778f0935"
22
github "norio-nomura/Quick" "4a7f1d0a7db637c3ca15b8f198a516fbc5581f87"
33
github "antitypical/Result" "3.0.0-alpha.4"
4-
github "jspahrsummers/xcconfigs" "1ef97639ffbe041da0b1392b2114fa19b922a7a1"
4+
github "jspahrsummers/xcconfigs" "3d9d99634cae6d586e272543d527681283b33eb0"

Carthage/Checkouts/xcconfigs

ReactiveCocoa.xcodeproj/project.pbxproj

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3176,8 +3176,6 @@
31763176
baseConfigurationReference = D047262919E49FE8006002AA /* Debug.xcconfig */;
31773177
buildSettings = {
31783178
BITCODE_GENERATION_MODE = bitcode;
3179-
CLANG_WARN_INFINITE_RECURSION = YES;
3180-
CLANG_WARN_SUSPICIOUS_MOVE = YES;
31813179
CODE_SIGNING_REQUIRED = NO;
31823180
CURRENT_PROJECT_VERSION = 1;
31833181
ENABLE_BITCODE = NO;
@@ -3200,8 +3198,6 @@
32003198
baseConfigurationReference = D047262B19E49FE8006002AA /* Release.xcconfig */;
32013199
buildSettings = {
32023200
BITCODE_GENERATION_MODE = bitcode;
3203-
CLANG_WARN_INFINITE_RECURSION = YES;
3204-
CLANG_WARN_SUSPICIOUS_MOVE = YES;
32053201
CODE_SIGNING_REQUIRED = NO;
32063202
CURRENT_PROJECT_VERSION = 1;
32073203
ENABLE_BITCODE = NO;
@@ -3331,8 +3327,6 @@
33313327
baseConfigurationReference = D047262A19E49FE8006002AA /* Profile.xcconfig */;
33323328
buildSettings = {
33333329
BITCODE_GENERATION_MODE = bitcode;
3334-
CLANG_WARN_INFINITE_RECURSION = YES;
3335-
CLANG_WARN_SUSPICIOUS_MOVE = YES;
33363330
CODE_SIGNING_REQUIRED = NO;
33373331
CURRENT_PROJECT_VERSION = 1;
33383332
ENABLE_BITCODE = NO;
@@ -3407,8 +3401,6 @@
34073401
baseConfigurationReference = D047262C19E49FE8006002AA /* Test.xcconfig */;
34083402
buildSettings = {
34093403
BITCODE_GENERATION_MODE = bitcode;
3410-
CLANG_WARN_INFINITE_RECURSION = YES;
3411-
CLANG_WARN_SUSPICIOUS_MOVE = YES;
34123404
CODE_SIGNING_REQUIRED = NO;
34133405
CURRENT_PROJECT_VERSION = 1;
34143406
ENABLE_BITCODE = NO;

ReactiveCocoa/Objective-C/RACCompoundDisposable.m

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ - (instancetype)initWithDisposables:(NSArray *)otherDisposables {
9494

9595
#if RACCompoundDisposableInlineCount
9696
[otherDisposables enumerateObjectsUsingBlock:^(RACDisposable *disposable, NSUInteger index, BOOL *stop) {
97-
_inlineDisposables[index] = disposable;
97+
self->_inlineDisposables[index] = disposable;
9898

9999
// Stop after this iteration if we've reached the end of the inlined
100100
// array.

0 commit comments

Comments
 (0)