diff options
| author |  Gil <mcg@google.com> | 2018-01-31 11:23:55 -0800 |
|---|---|---|
| committer |  GitHub <noreply@github.com> | 2018-01-31 11:23:55 -0800 |
| commit | 729b8d176c75ecc0cbbd137cc6811116a64e310a (patch) | |
| tree | 22b793b03611ce5ad615b7c7d9579f5ba5206b4a /Firestore/Example/Tests/Remote | |
| parent | 693d0649bfcc9c32201e2431ae08ea85fdbdb617 (diff) | |
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
Diffstat (limited to 'Firestore/Example/Tests/Remote')
| -rw-r--r-- | Firestore/Example/Tests/Remote/FSTDatastoreTests.mm (renamed from Firestore/Example/Tests/Remote/FSTDatastoreTests.m) | 0 | ||||
| -rw-r--r-- | Firestore/Example/Tests/Remote/FSTRemoteEventTests.mm (renamed from Firestore/Example/Tests/Remote/FSTRemoteEventTests.m) | 0 | ||||
| -rw-r--r-- | Firestore/Example/Tests/Remote/FSTSerializerBetaTests.mm (renamed from Firestore/Example/Tests/Remote/FSTSerializerBetaTests.m) | 5 | ||||
| -rw-r--r-- | Firestore/Example/Tests/Remote/FSTWatchChange+Testing.mm (renamed from Firestore/Example/Tests/Remote/FSTWatchChange+Testing.m) | 0 | ||||
| -rw-r--r-- | Firestore/Example/Tests/Remote/FSTWatchChangeTests.mm (renamed from Firestore/Example/Tests/Remote/FSTWatchChangeTests.m) | 0 |
5 files changed, 2 insertions, 3 deletions
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 |