Move all Firestore Objective-C to Objective-C++ (#734)

* Move all Firestore files to Objective-C++
* Update project file references
* Don't use module imports from Objective-C++
* Use extern "C" for C-accessible globals
* Work around more stringent type checking in Objective-C++
  * NSMutableDictionary ivars aren't implicitly casted to NSDictionary
  * FSTMaybeDocument callback can't be passed a function that accepts
    FSTDocument
  * NSComparisonResult can't be multiplied by -1 without casting
* Add a #include <inttypes.h> where needed
* Avoid using C++ keywords as variables
* Remove #if __cplusplus guards

67 files changed, 27 insertions, 22 deletions

diff --git a/Firestore/Example/Tests/API/FIRCollectionReferenceTests.m b/Firestore/Example/Tests/API/FIRCollectionReferenceTests.mm
index 547078f..547078f 100644
--- a/Firestore/Example/Tests/API/FIRCollectionReferenceTests.m
+++ b/Firestore/Example/Tests/API/FIRCollectionReferenceTests.mm
diff --git a/Firestore/Example/Tests/API/FIRDocumentReferenceTests.m b/Firestore/Example/Tests/API/FIRDocumentReferenceTests.mm
index cc2b431..cc2b431 100644
--- a/Firestore/Example/Tests/API/FIRDocumentReferenceTests.m
+++ b/Firestore/Example/Tests/API/FIRDocumentReferenceTests.mm
diff --git a/Firestore/Example/Tests/API/FIRDocumentSnapshotTests.m b/Firestore/Example/Tests/API/FIRDocumentSnapshotTests.mm
index 677d385..677d385 100644
--- a/Firestore/Example/Tests/API/FIRDocumentSnapshotTests.m
+++ b/Firestore/Example/Tests/API/FIRDocumentSnapshotTests.mm
diff --git a/Firestore/Example/Tests/API/FIRFieldPathTests.m b/Firestore/Example/Tests/API/FIRFieldPathTests.mm
index 679ea89..679ea89 100644
--- a/Firestore/Example/Tests/API/FIRFieldPathTests.m
+++ b/Firestore/Example/Tests/API/FIRFieldPathTests.mm
diff --git a/Firestore/Example/Tests/API/FIRFieldValueTests.m b/Firestore/Example/Tests/API/FIRFieldValueTests.mm
index becf7d6..575dfee 100644
--- a/Firestore/Example/Tests/API/FIRFieldValueTests.m
+++ b/Firestore/Example/Tests/API/FIRFieldValueTests.mm
@@ -26,19 +26,19 @@ NS_ASSUME_NONNULL_BEGIN
 @implementation FIRFieldValueTests
 
 - (void)testEquals {
-  FIRFieldValue *delete = [FIRFieldValue fieldValueForDelete];
+  FIRFieldValue *deleted = [FIRFieldValue fieldValueForDelete];
   FIRFieldValue *deleteDup = [FIRFieldValue fieldValueForDelete];
   FIRFieldValue *serverTimestamp = [FIRFieldValue fieldValueForServerTimestamp];
   FIRFieldValue *serverTimestampDup = [FIRFieldValue fieldValueForServerTimestamp];
-  XCTAssertEqualObjects(delete, deleteDup);
-  XCTAssertNotEqualObjects(delete, nil);
+  XCTAssertEqualObjects(deleted, deleteDup);
+  XCTAssertNotEqualObjects(deleted, nil);
   XCTAssertEqualObjects(serverTimestamp, serverTimestampDup);
   XCTAssertNotEqualObjects(serverTimestamp, nil);
-  XCTAssertNotEqualObjects(delete, serverTimestamp);
+  XCTAssertNotEqualObjects(deleted, serverTimestamp);
 
-  XCTAssertEqual([delete hash], [deleteDup hash]);
+  XCTAssertEqual([deleted hash], [deleteDup hash]);
   XCTAssertEqual([serverTimestamp hash], [serverTimestamp hash]);
-  XCTAssertNotEqual([delete hash], [serverTimestamp hash]);
+  XCTAssertNotEqual([deleted hash], [serverTimestamp hash]);
 }
 
 @end
diff --git a/Firestore/Example/Tests/API/FIRGeoPointTests.m b/Firestore/Example/Tests/API/FIRGeoPointTests.mm
index 4de80a8..4de80a8 100644
--- a/Firestore/Example/Tests/API/FIRGeoPointTests.m
+++ b/Firestore/Example/Tests/API/FIRGeoPointTests.mm
diff --git a/Firestore/Example/Tests/API/FIRQuerySnapshotTests.m b/Firestore/Example/Tests/API/FIRQuerySnapshotTests.mm
index 067425a..067425a 100644
--- a/Firestore/Example/Tests/API/FIRQuerySnapshotTests.m
+++ b/Firestore/Example/Tests/API/FIRQuerySnapshotTests.mm
diff --git a/Firestore/Example/Tests/API/FIRQueryTests.m b/Firestore/Example/Tests/API/FIRQueryTests.mm
index 83f90be..83f90be 100644
--- a/Firestore/Example/Tests/API/FIRQueryTests.m
+++ b/Firestore/Example/Tests/API/FIRQueryTests.mm
diff --git a/Firestore/Example/Tests/API/FIRSnapshotMetadataTests.m b/Firestore/Example/Tests/API/FIRSnapshotMetadataTests.mm
index a4d321b..a4d321b 100644
--- a/Firestore/Example/Tests/API/FIRSnapshotMetadataTests.m
+++ b/Firestore/Example/Tests/API/FIRSnapshotMetadataTests.mm
diff --git a/Firestore/Example/Tests/API/FSTAPIHelpers.m b/Firestore/Example/Tests/API/FSTAPIHelpers.mm
index da899b7..da899b7 100644
--- a/Firestore/Example/Tests/API/FSTAPIHelpers.m
+++ b/Firestore/Example/Tests/API/FSTAPIHelpers.mm
diff --git a/Firestore/Example/Tests/Core/FSTDatabaseInfoTests.m b/Firestore/Example/Tests/Core/FSTDatabaseInfoTests.mm
index c7cf22a..c7cf22a 100644
--- a/Firestore/Example/Tests/Core/FSTDatabaseInfoTests.m
+++ b/Firestore/Example/Tests/Core/FSTDatabaseInfoTests.mm
diff --git a/Firestore/Example/Tests/Core/FSTEventManagerTests.m b/Firestore/Example/Tests/Core/FSTEventManagerTests.mm
index fcde17d..fcde17d 100644
--- a/Firestore/Example/Tests/Core/FSTEventManagerTests.m
+++ b/Firestore/Example/Tests/Core/FSTEventManagerTests.mm
diff --git a/Firestore/Example/Tests/Core/FSTQueryListenerTests.m b/Firestore/Example/Tests/Core/FSTQueryListenerTests.mm
index 4856b5f..4856b5f 100644
--- a/Firestore/Example/Tests/Core/FSTQueryListenerTests.m
+++ b/Firestore/Example/Tests/Core/FSTQueryListenerTests.mm
diff --git a/Firestore/Example/Tests/Core/FSTQueryTests.m b/Firestore/Example/Tests/Core/FSTQueryTests.mm
index 3d2bd82..3d2bd82 100644
--- a/Firestore/Example/Tests/Core/FSTQueryTests.m
+++ b/Firestore/Example/Tests/Core/FSTQueryTests.mm
diff --git a/Firestore/Example/Tests/Core/FSTTimestampTests.m b/Firestore/Example/Tests/Core/FSTTimestampTests.mm
index a3765fe..a3765fe 100644
--- a/Firestore/Example/Tests/Core/FSTTimestampTests.m
+++ b/Firestore/Example/Tests/Core/FSTTimestampTests.mm
diff --git a/Firestore/Example/Tests/Core/FSTViewSnapshotTest.m b/Firestore/Example/Tests/Core/FSTViewSnapshotTest.mm
index fe3e42d..fe3e42d 100644
--- a/Firestore/Example/Tests/Core/FSTViewSnapshotTest.m
+++ b/Firestore/Example/Tests/Core/FSTViewSnapshotTest.mm
diff --git a/Firestore/Example/Tests/Core/FSTViewTests.m b/Firestore/Example/Tests/Core/FSTViewTests.mm
index e6c4510..e6c4510 100644
--- a/Firestore/Example/Tests/Core/FSTViewTests.m
+++ b/Firestore/Example/Tests/Core/FSTViewTests.mm
diff --git a/Firestore/Example/Tests/Integration/API/FIRCursorTests.m b/Firestore/Example/Tests/Integration/API/FIRCursorTests.mm
index dc9da83..3b5c38f 100644
--- a/Firestore/Example/Tests/Integration/API/FIRCursorTests.m
+++ b/Firestore/Example/Tests/Integration/API/FIRCursorTests.mm
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-@import FirebaseFirestore;
+#import <FirebaseFirestore/FirebaseFirestore.h>
 
 #import <XCTest/XCTest.h>
 
diff --git a/Firestore/Example/Tests/Integration/API/FIRDatabaseTests.m b/Firestore/Example/Tests/Integration/API/FIRDatabaseTests.mm
index 9a53e29..3b6a67e 100644
--- a/Firestore/Example/Tests/Integration/API/FIRDatabaseTests.m
+++ b/Firestore/Example/Tests/Integration/API/FIRDatabaseTests.mm
@@ -14,9 +14,8 @@
  * limitations under the License.
  */
 
-@import FirebaseFirestore;
+#import <FirebaseFirestore/FirebaseFirestore.h>
 
-#import <FirebaseFirestore/FIRFirestore.h>
 #import <XCTest/XCTest.h>
 
 #import "Firestore/Example/Tests/Util/FSTIntegrationTestCase.h"
diff --git a/Firestore/Example/Tests/Integration/API/FIRFieldsTests.m b/Firestore/Example/Tests/Integration/API/FIRFieldsTests.mm
index b647f52..34bd87e 100644
--- a/Firestore/Example/Tests/Integration/API/FIRFieldsTests.m
+++ b/Firestore/Example/Tests/Integration/API/FIRFieldsTests.mm
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-@import FirebaseFirestore;
+#import <FirebaseFirestore/FirebaseFirestore.h>
 
 #import <XCTest/XCTest.h>
 
diff --git a/Firestore/Example/Tests/Integration/API/FIRListenerRegistrationTests.m b/Firestore/Example/Tests/Integration/API/FIRListenerRegistrationTests.mm
index 52d73b1..036ab32 100644
--- a/Firestore/Example/Tests/Integration/API/FIRListenerRegistrationTests.m
+++ b/Firestore/Example/Tests/Integration/API/FIRListenerRegistrationTests.mm
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-@import FirebaseFirestore;
+#import <FirebaseFirestore/FirebaseFirestore.h>
 
 #import <XCTest/XCTest.h>
 
diff --git a/Firestore/Example/Tests/Integration/API/FIRQueryTests.m b/Firestore/Example/Tests/Integration/API/FIRQueryTests.mm
index 58f57bc..32d746e 100644
--- a/Firestore/Example/Tests/Integration/API/FIRQueryTests.m
+++ b/Firestore/Example/Tests/Integration/API/FIRQueryTests.mm
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-@import FirebaseFirestore;
+#import <FirebaseFirestore/FirebaseFirestore.h>
 
 #import <XCTest/XCTest.h>
 
diff --git a/Firestore/Example/Tests/Integration/API/FIRServerTimestampTests.m b/Firestore/Example/Tests/Integration/API/FIRServerTimestampTests.mm
index cc0ab29..916ce7e 100644
--- a/Firestore/Example/Tests/Integration/API/FIRServerTimestampTests.m
+++ b/Firestore/Example/Tests/Integration/API/FIRServerTimestampTests.mm
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-@import FirebaseFirestore;
+#import <FirebaseFirestore/FirebaseFirestore.h>
 
 #import <XCTest/XCTest.h>
 
diff --git a/Firestore/Example/Tests/Integration/API/FIRTypeTests.m b/Firestore/Example/Tests/Integration/API/FIRTypeTests.mm
index 1874f00..5140b90 100644
--- a/Firestore/Example/Tests/Integration/API/FIRTypeTests.m
+++ b/Firestore/Example/Tests/Integration/API/FIRTypeTests.mm
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-@import FirebaseFirestore;
+#import <FirebaseFirestore/FirebaseFirestore.h>
 
 #import <XCTest/XCTest.h>
 
diff --git a/Firestore/Example/Tests/Integration/API/FIRValidationTests.m b/Firestore/Example/Tests/Integration/API/FIRValidationTests.mm
index 8b760c9..49e572a 100644
--- a/Firestore/Example/Tests/Integration/API/FIRValidationTests.m
+++ b/Firestore/Example/Tests/Integration/API/FIRValidationTests.mm
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-@import FirebaseFirestore;
+#import <FirebaseFirestore/FirebaseFirestore.h>
 
 #import <XCTest/XCTest.h>
 
diff --git a/Firestore/Example/Tests/Integration/API/FIRWriteBatchTests.m b/Firestore/Example/Tests/Integration/API/FIRWriteBatchTests.mm
index 5e7f6d7..9a2fef1 100644
--- a/Firestore/Example/Tests/Integration/API/FIRWriteBatchTests.m
+++ b/Firestore/Example/Tests/Integration/API/FIRWriteBatchTests.mm
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-@import FirebaseFirestore;
+#import <FirebaseFirestore/FirebaseFirestore.h>
 
 #import <XCTest/XCTest.h>
 
diff --git a/Firestore/Example/Tests/Integration/FSTDatastoreTests.m b/Firestore/Example/Tests/Integration/FSTDatastoreTests.mm
index 047f059..bf56367 100644
--- a/Firestore/Example/Tests/Integration/FSTDatastoreTests.m
+++ b/Firestore/Example/Tests/Integration/FSTDatastoreTests.mm
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-@import FirebaseFirestore;
+#import <FirebaseFirestore/FirebaseFirestore.h>
 
 #import <GRPCClient/GRPCCall+ChannelCredentials.h>
 #import <GRPCClient/GRPCCall+Tests.h>
diff --git a/Firestore/Example/Tests/Integration/FSTSmokeTests.m b/Firestore/Example/Tests/Integration/FSTSmokeTests.mm
index ad75e50..cb726b8 100644
--- a/Firestore/Example/Tests/Integration/FSTSmokeTests.m
+++ b/Firestore/Example/Tests/Integration/FSTSmokeTests.mm
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-@import FirebaseFirestore;
+#import <FirebaseFirestore/FirebaseFirestore.h>
 
 #import <XCTest/XCTest.h>
 
diff --git a/Firestore/Example/Tests/Integration/FSTStreamTests.m b/Firestore/Example/Tests/Integration/FSTStreamTests.mm
index bbdf372..bbdf372 100644
--- a/Firestore/Example/Tests/Integration/FSTStreamTests.m
+++ b/Firestore/Example/Tests/Integration/FSTStreamTests.mm
diff --git a/Firestore/Example/Tests/Integration/FSTTransactionTests.m b/Firestore/Example/Tests/Integration/FSTTransactionTests.mm
index 2e828c9..21803ea 100644
--- a/Firestore/Example/Tests/Integration/FSTTransactionTests.m
+++ b/Firestore/Example/Tests/Integration/FSTTransactionTests.mm
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-@import FirebaseFirestore;
+#import <FirebaseFirestore/FirebaseFirestore.h>
 
 #import <XCTest/XCTest.h>
 #include <libkern/OSAtomic.h>
diff --git a/Firestore/Example/Tests/Local/FSTEagerGarbageCollectorTests.m b/Firestore/Example/Tests/Local/FSTEagerGarbageCollectorTests.mm
index 53f0202..53f0202 100644
--- a/Firestore/Example/Tests/Local/FSTEagerGarbageCollectorTests.m
+++ b/Firestore/Example/Tests/Local/FSTEagerGarbageCollectorTests.mm
diff --git a/Firestore/Example/Tests/Local/FSTLevelDBLocalStoreTests.m b/Firestore/Example/Tests/Local/FSTLevelDBLocalStoreTests.mm
index f71f5c9..f71f5c9 100644
--- a/Firestore/Example/Tests/Local/FSTLevelDBLocalStoreTests.m
+++ b/Firestore/Example/Tests/Local/FSTLevelDBLocalStoreTests.mm
diff --git a/Firestore/Example/Tests/Local/FSTLevelDBQueryCacheTests.m b/Firestore/Example/Tests/Local/FSTLevelDBQueryCacheTests.mm
index 929ab9e..929ab9e 100644
--- a/Firestore/Example/Tests/Local/FSTLevelDBQueryCacheTests.m
+++ b/Firestore/Example/Tests/Local/FSTLevelDBQueryCacheTests.mm
diff --git a/Firestore/Example/Tests/Local/FSTLocalSerializerTests.m b/Firestore/Example/Tests/Local/FSTLocalSerializerTests.mm
index 95b9b11..95b9b11 100644
--- a/Firestore/Example/Tests/Local/FSTLocalSerializerTests.m
+++ b/Firestore/Example/Tests/Local/FSTLocalSerializerTests.mm
diff --git a/Firestore/Example/Tests/Local/FSTLocalStoreTests.m b/Firestore/Example/Tests/Local/FSTLocalStoreTests.mm
index 45d1815..45d1815 100644
--- a/Firestore/Example/Tests/Local/FSTLocalStoreTests.m
+++ b/Firestore/Example/Tests/Local/FSTLocalStoreTests.mm
diff --git a/Firestore/Example/Tests/Local/FSTMemoryLocalStoreTests.m b/Firestore/Example/Tests/Local/FSTMemoryLocalStoreTests.mm
index b78239e..b78239e 100644
--- a/Firestore/Example/Tests/Local/FSTMemoryLocalStoreTests.m
+++ b/Firestore/Example/Tests/Local/FSTMemoryLocalStoreTests.mm
diff --git a/Firestore/Example/Tests/Local/FSTMemoryMutationQueueTests.m b/Firestore/Example/Tests/Local/FSTMemoryMutationQueueTests.mm
index ab7afee..ab7afee 100644
--- a/Firestore/Example/Tests/Local/FSTMemoryMutationQueueTests.m
+++ b/Firestore/Example/Tests/Local/FSTMemoryMutationQueueTests.mm
diff --git a/Firestore/Example/Tests/Local/FSTMemoryQueryCacheTests.m b/Firestore/Example/Tests/Local/FSTMemoryQueryCacheTests.mm
index fb7df6b..fb7df6b 100644
--- a/Firestore/Example/Tests/Local/FSTMemoryQueryCacheTests.m
+++ b/Firestore/Example/Tests/Local/FSTMemoryQueryCacheTests.mm
diff --git a/Firestore/Example/Tests/Local/FSTMemoryRemoteDocumentCacheTests.m b/Firestore/Example/Tests/Local/FSTMemoryRemoteDocumentCacheTests.mm
index 162eef0..162eef0 100644
--- a/Firestore/Example/Tests/Local/FSTMemoryRemoteDocumentCacheTests.m
+++ b/Firestore/Example/Tests/Local/FSTMemoryRemoteDocumentCacheTests.mm
diff --git a/Firestore/Example/Tests/Local/FSTMutationQueueTests.m b/Firestore/Example/Tests/Local/FSTMutationQueueTests.mm
index 020a0a7..020a0a7 100644
--- a/Firestore/Example/Tests/Local/FSTMutationQueueTests.m
+++ b/Firestore/Example/Tests/Local/FSTMutationQueueTests.mm
diff --git a/Firestore/Example/Tests/Local/FSTPersistenceTestHelpers.m b/Firestore/Example/Tests/Local/FSTPersistenceTestHelpers.mm
index e9e129d..e9e129d 100644
--- a/Firestore/Example/Tests/Local/FSTPersistenceTestHelpers.m
+++ b/Firestore/Example/Tests/Local/FSTPersistenceTestHelpers.mm
diff --git a/Firestore/Example/Tests/Local/FSTQueryCacheTests.m b/Firestore/Example/Tests/Local/FSTQueryCacheTests.mm
index 0c6a2a4..0c6a2a4 100644
--- a/Firestore/Example/Tests/Local/FSTQueryCacheTests.m
+++ b/Firestore/Example/Tests/Local/FSTQueryCacheTests.mm
diff --git a/Firestore/Example/Tests/Local/FSTReferenceSetTests.m b/Firestore/Example/Tests/Local/FSTReferenceSetTests.mm
index 802117a..802117a 100644
--- a/Firestore/Example/Tests/Local/FSTReferenceSetTests.m
+++ b/Firestore/Example/Tests/Local/FSTReferenceSetTests.mm
diff --git a/Firestore/Example/Tests/Local/FSTRemoteDocumentCacheTests.m b/Firestore/Example/Tests/Local/FSTRemoteDocumentCacheTests.mm
index d240604..d240604 100644
--- a/Firestore/Example/Tests/Local/FSTRemoteDocumentCacheTests.m
+++ b/Firestore/Example/Tests/Local/FSTRemoteDocumentCacheTests.mm
diff --git a/Firestore/Example/Tests/Local/FSTRemoteDocumentChangeBufferTests.m b/Firestore/Example/Tests/Local/FSTRemoteDocumentChangeBufferTests.mm
index 1970779..1970779 100644
--- a/Firestore/Example/Tests/Local/FSTRemoteDocumentChangeBufferTests.m
+++ b/Firestore/Example/Tests/Local/FSTRemoteDocumentChangeBufferTests.mm
diff --git a/Firestore/Example/Tests/Model/FSTDatabaseIDTests.m b/Firestore/Example/Tests/Model/FSTDatabaseIDTests.mm
index cb1b19d..cb1b19d 100644
--- a/Firestore/Example/Tests/Model/FSTDatabaseIDTests.m
+++ b/Firestore/Example/Tests/Model/FSTDatabaseIDTests.mm
diff --git a/Firestore/Example/Tests/Model/FSTDocumentKeyTests.m b/Firestore/Example/Tests/Model/FSTDocumentKeyTests.mm
index d66ee73..d66ee73 100644
--- a/Firestore/Example/Tests/Model/FSTDocumentKeyTests.m
+++ b/Firestore/Example/Tests/Model/FSTDocumentKeyTests.mm
diff --git a/Firestore/Example/Tests/Model/FSTDocumentSetTests.m b/Firestore/Example/Tests/Model/FSTDocumentSetTests.mm
index bf6cd21..bf6cd21 100644
--- a/Firestore/Example/Tests/Model/FSTDocumentSetTests.m
+++ b/Firestore/Example/Tests/Model/FSTDocumentSetTests.mm
diff --git a/Firestore/Example/Tests/Model/FSTDocumentTests.m b/Firestore/Example/Tests/Model/FSTDocumentTests.mm
index 59f526d..59f526d 100644
--- a/Firestore/Example/Tests/Model/FSTDocumentTests.m
+++ b/Firestore/Example/Tests/Model/FSTDocumentTests.mm
diff --git a/Firestore/Example/Tests/Model/FSTFieldValueTests.m b/Firestore/Example/Tests/Model/FSTFieldValueTests.mm
index 56b885f..56b885f 100644
--- a/Firestore/Example/Tests/Model/FSTFieldValueTests.m
+++ b/Firestore/Example/Tests/Model/FSTFieldValueTests.mm
diff --git a/Firestore/Example/Tests/Model/FSTMutationTests.m b/Firestore/Example/Tests/Model/FSTMutationTests.mm
index 47fa9b3..47fa9b3 100644
--- a/Firestore/Example/Tests/Model/FSTMutationTests.m
+++ b/Firestore/Example/Tests/Model/FSTMutationTests.mm
diff --git a/Firestore/Example/Tests/Model/FSTPathTests.m b/Firestore/Example/Tests/Model/FSTPathTests.mm
index b8529e5..b8529e5 100644
--- a/Firestore/Example/Tests/Model/FSTPathTests.m
+++ b/Firestore/Example/Tests/Model/FSTPathTests.mm
diff --git a/Firestore/Example/Tests/Remote/FSTDatastoreTests.m b/Firestore/Example/Tests/Remote/FSTDatastoreTests.mm
index 6d6e912..6d6e912 100644
--- a/Firestore/Example/Tests/Remote/FSTDatastoreTests.m
+++ b/Firestore/Example/Tests/Remote/FSTDatastoreTests.mm
diff --git a/Firestore/Example/Tests/Remote/FSTRemoteEventTests.m b/Firestore/Example/Tests/Remote/FSTRemoteEventTests.mm
index a947eb4..a947eb4 100644
--- a/Firestore/Example/Tests/Remote/FSTRemoteEventTests.m
+++ b/Firestore/Example/Tests/Remote/FSTRemoteEventTests.mm
diff --git a/Firestore/Example/Tests/Remote/FSTSerializerBetaTests.m b/Firestore/Example/Tests/Remote/FSTSerializerBetaTests.mm
index 1ea0ff2..de4a07a 100644
--- a/Firestore/Example/Tests/Remote/FSTSerializerBetaTests.m
+++ b/Firestore/Example/Tests/Remote/FSTSerializerBetaTests.mm
@@ -550,8 +550,7 @@ NS_ASSUME_NONNULL_BEGIN
 }
 
 - (void)unaryFilterTestWithValue:(id)value
-           expectedUnaryOperator:(GCFSStructuredQuery_UnaryFilter_Operator)
-                                 operator{
+           expectedUnaryOperator:(GCFSStructuredQuery_UnaryFilter_Operator)op {
   FSTQuery *q = [FSTTestQuery(@"docs") queryByAddingFilter:FSTTestFilter(@"prop", @"==", value)];
   FSTQueryData *model = [self queryDataForQuery:q];
 
@@ -565,7 +564,7 @@ NS_ASSUME_NONNULL_BEGIN
 
   GCFSStructuredQuery_UnaryFilter *filter = expected.query.structuredQuery.where.unaryFilter;
   filter.field.fieldPath = @"prop";
-  filter.op = operator;
+  filter.op = op;
   expected.targetId = 1;
 
   [self assertRoundTripForQueryData:model proto:expected];
diff --git a/Firestore/Example/Tests/Remote/FSTWatchChange+Testing.m b/Firestore/Example/Tests/Remote/FSTWatchChange+Testing.mm
index 6bb314d..6bb314d 100644
--- a/Firestore/Example/Tests/Remote/FSTWatchChange+Testing.m
+++ b/Firestore/Example/Tests/Remote/FSTWatchChange+Testing.mm
diff --git a/Firestore/Example/Tests/Remote/FSTWatchChangeTests.m b/Firestore/Example/Tests/Remote/FSTWatchChangeTests.mm
index df2496b..df2496b 100644
--- a/Firestore/Example/Tests/Remote/FSTWatchChangeTests.m
+++ b/Firestore/Example/Tests/Remote/FSTWatchChangeTests.mm
diff --git a/Firestore/Example/Tests/SpecTests/FSTLevelDBSpecTests.m b/Firestore/Example/Tests/SpecTests/FSTLevelDBSpecTests.mm
index a67f667..a67f667 100644
--- a/Firestore/Example/Tests/SpecTests/FSTLevelDBSpecTests.m
+++ b/Firestore/Example/Tests/SpecTests/FSTLevelDBSpecTests.mm
diff --git a/Firestore/Example/Tests/SpecTests/FSTMemorySpecTests.m b/Firestore/Example/Tests/SpecTests/FSTMemorySpecTests.mm
index 3030ab5..3030ab5 100644
--- a/Firestore/Example/Tests/SpecTests/FSTMemorySpecTests.m
+++ b/Firestore/Example/Tests/SpecTests/FSTMemorySpecTests.mm
diff --git a/Firestore/Example/Tests/SpecTests/FSTMockDatastore.m b/Firestore/Example/Tests/SpecTests/FSTMockDatastore.mm
index 9a1d719..9a1d719 100644
--- a/Firestore/Example/Tests/SpecTests/FSTMockDatastore.m
+++ b/Firestore/Example/Tests/SpecTests/FSTMockDatastore.mm
diff --git a/Firestore/Example/Tests/SpecTests/FSTSpecTests.m b/Firestore/Example/Tests/SpecTests/FSTSpecTests.mm
index 3335990..3335990 100644
--- a/Firestore/Example/Tests/SpecTests/FSTSpecTests.m
+++ b/Firestore/Example/Tests/SpecTests/FSTSpecTests.mm
diff --git a/Firestore/Example/Tests/SpecTests/FSTSyncEngineTestDriver.m b/Firestore/Example/Tests/SpecTests/FSTSyncEngineTestDriver.mm
index c23fa28..a4de615 100644
--- a/Firestore/Example/Tests/SpecTests/FSTSyncEngineTestDriver.m
+++ b/Firestore/Example/Tests/SpecTests/FSTSyncEngineTestDriver.mm
@@ -139,6 +139,11 @@ NS_ASSUME_NONNULL_BEGIN
   return self;
 }
 
+- (NSDictionary<FSTUser *, NSMutableArray<FSTOutstandingWrite *> *> *)outstandingWrites {
+  return static_cast<NSDictionary<FSTUser *, NSMutableArray<FSTOutstandingWrite *> *> *>(
+      _outstandingWrites);
+}
+
 - (void)applyChangedOnlineState:(FSTOnlineState)onlineState {
   [self.syncEngine applyChangedOnlineState:onlineState];
   [self.eventManager applyChangedOnlineState:onlineState];
diff --git a/Firestore/Example/Tests/Util/FSTAssertTests.m b/Firestore/Example/Tests/Util/FSTAssertTests.mm
index 0cba03f..0cba03f 100644
--- a/Firestore/Example/Tests/Util/FSTAssertTests.m
+++ b/Firestore/Example/Tests/Util/FSTAssertTests.mm
diff --git a/Firestore/Example/Tests/Util/FSTEventAccumulator.m b/Firestore/Example/Tests/Util/FSTEventAccumulator.mm
index c4c1602..c4c1602 100644
--- a/Firestore/Example/Tests/Util/FSTEventAccumulator.m
+++ b/Firestore/Example/Tests/Util/FSTEventAccumulator.mm
diff --git a/Firestore/Example/Tests/Util/FSTHelpers.m b/Firestore/Example/Tests/Util/FSTHelpers.mm
index c1506b0..64fe213 100644
--- a/Firestore/Example/Tests/Util/FSTHelpers.m
+++ b/Firestore/Example/Tests/Util/FSTHelpers.mm
@@ -16,6 +16,8 @@
 
 #import "Firestore/Example/Tests/Util/FSTHelpers.h"
 
+#include <inttypes.h>
+
 #import <FirebaseFirestore/FIRFieldPath.h>
 #import <FirebaseFirestore/FIRGeoPoint.h>
 
diff --git a/Firestore/Example/Tests/Util/FSTTestDispatchQueue.m b/Firestore/Example/Tests/Util/FSTTestDispatchQueue.mm
index 8124cf2..8124cf2 100644
--- a/Firestore/Example/Tests/Util/FSTTestDispatchQueue.m
+++ b/Firestore/Example/Tests/Util/FSTTestDispatchQueue.mm
diff --git a/Firestore/Example/Tests/Util/XCTestCase+Await.m b/Firestore/Example/Tests/Util/XCTestCase+Await.mm
index 7f4356c..7f4356c 100644
--- a/Firestore/Example/Tests/Util/XCTestCase+Await.m
+++ b/Firestore/Example/Tests/Util/XCTestCase+Await.mm