diff options
4 files changed, 12 insertions, 12 deletions
diff --git a/Firestore/Example/Tests/Util/FSTDispatchQueueTests.mm b/Firestore/Example/Tests/Util/FSTDispatchQueueTests.mm index 60b1705..811fa34 100644 --- a/Firestore/Example/Tests/Util/FSTDispatchQueueTests.mm +++ b/Firestore/Example/Tests/Util/FSTDispatchQueueTests.mm @@ -157,7 +157,7 @@ static const FSTTimerID timerID3 = FSTTimerIDWriteStreamConnectionBackoff; __block NSException *caught = nil; dispatch_sync(_underlyingQueue, ^{ @try { - [_queue verifyIsCurrentQueue]; + [self->_queue verifyIsCurrentQueue]; } @catch (NSException *ex) { caught = ex; } @@ -172,7 +172,7 @@ static const FSTTimerID timerID3 = FSTTimerIDWriteStreamConnectionBackoff; __block NSException *caught = nil; [_queue dispatchSync:^{ @try { - [_queue verifyIsCurrentQueue]; + [self->_queue verifyIsCurrentQueue]; } @catch (NSException *ex) { caught = ex; } @@ -185,7 +185,7 @@ static const FSTTimerID timerID3 = FSTTimerIDWriteStreamConnectionBackoff; __block NSString *problem = nil; [_queue dispatchSync:^{ @try { - [_queue enterCheckedOperation:^{ + [self->_queue enterCheckedOperation:^{ }]; problem = @"Should not have been able to enter nested enterCheckedOperation"; } @catch (NSException *ex) { @@ -229,14 +229,14 @@ static const FSTTimerID timerID3 = FSTTimerIDWriteStreamConnectionBackoff; _expectedSteps = @[ @1, @3 ]; // Queue everything from the queue to ensure nothing completes before we cancel. [_queue dispatchAsync:^{ - [_queue dispatchAsyncAllowingSameQueue:[self blockForStep:1]]; + [self->_queue dispatchAsyncAllowingSameQueue:[self blockForStep:1]]; FSTDelayedCallback *step2Timer = - [_queue dispatchAfterDelay:.001 timerID:timerID1 block:[self blockForStep:2]]; - [_queue dispatchAfterDelay:.005 timerID:timerID2 block:[self blockForStep:3]]; + [self->_queue dispatchAfterDelay:.001 timerID:timerID1 block:[self blockForStep:2]]; + [self->_queue dispatchAfterDelay:.005 timerID:timerID2 block:[self blockForStep:3]]; - XCTAssertTrue([_queue containsDelayedCallbackWithTimerID:timerID1]); + XCTAssertTrue([self->_queue containsDelayedCallbackWithTimerID:timerID1]); [step2Timer cancel]; - XCTAssertFalse([_queue containsDelayedCallbackWithTimerID:timerID1]); + XCTAssertFalse([self->_queue containsDelayedCallbackWithTimerID:timerID1]); }]; [self awaitExpectations]; diff --git a/Firestore/Example/Tests/Util/FSTEventAccumulator.mm b/Firestore/Example/Tests/Util/FSTEventAccumulator.mm index c4c1602..623ba2d 100644 --- a/Firestore/Example/Tests/Util/FSTEventAccumulator.mm +++ b/Firestore/Example/Tests/Util/FSTEventAccumulator.mm @@ -75,7 +75,7 @@ NS_ASSUME_NONNULL_BEGIN id event = value ? value : [NSNull null]; @synchronized(self) { - [_events addObject:event]; + [self->_events addObject:event]; [self checkFulfilled]; } }; diff --git a/Firestore/Source/Model/FSTMutation.mm b/Firestore/Source/Model/FSTMutation.mm index 47e34da..3432a7c 100644 --- a/Firestore/Source/Model/FSTMutation.mm +++ b/Firestore/Source/Model/FSTMutation.mm @@ -379,8 +379,8 @@ serverTransformResultsWithBaseDocument:(nullable FSTMaybeDocument *)baseDocument serverTransformResults:(NSArray<FSTFieldValue *> *)serverTransformResults { NSMutableArray<FSTFieldValue *> *transformResults = [NSMutableArray array]; FSTAssert(self.fieldTransforms.size() == serverTransformResults.count, - @"server transform result count (%ld) should match field transforms count (%ld)", - serverTransformResults.count, self.fieldTransforms.size()); + @"server transform result count (%lu) should match field transforms count (%zu)", + (unsigned long)serverTransformResults.count, self.fieldTransforms.size()); for (NSUInteger i = 0; i < serverTransformResults.count; i++) { const FieldTransform &fieldTransform = self.fieldTransforms[i]; diff --git a/Firestore/core/src/firebase/firestore/util/error_apple.h b/Firestore/core/src/firebase/firestore/util/error_apple.h index e7c77c9..66080dd 100644 --- a/Firestore/core/src/firebase/firestore/util/error_apple.h +++ b/Firestore/core/src/firebase/firestore/util/error_apple.h @@ -40,7 +40,7 @@ inline NSError* MakeNSError(const int64_t error_code, } return [NSError errorWithDomain:FIRFirestoreErrorDomain - code:error_code + code:static_cast<NSInteger>(error_code) userInfo:@{NSLocalizedDescriptionKey : WrapNSString(error_msg)}]; } |