diff options
| author |  zxu <zxu@google.com> | 2018-03-14 08:57:31 -0400 |
|---|---|---|
| committer |  GitHub <noreply@github.com> | 2018-03-14 08:57:31 -0400 |
| commit | 9e815620e9f7f43b42e03db4e5118d7ad03ddee7 (patch) | |
| tree | 86f362bad99281325fca7ee3ae116b6a0f36d511 /Firestore/Source/Model/FSTDocument.mm | |
| parent | d4d73ea53ecdf1e8ade3d00921419645dd5d66f7 (diff) | |
grand PR to port the remaining paths (FieldPath and ResourcePath). (#865)
* naively remove FSTPath import and source/test files.
* port FieldPath, part I
* port FieldPath, part II
* port ResourcePath, part I
* port ResourcePath, part II
* the grand commit to fix build errors
* use testutil:: helper instead of those from FSTHelpers
* fix test and lint
* use c_str in errmsg directly
* fix
* fix
* make code clean
* fix integration test I missed
* fix to avoid naming collision in preprocessor
* address changes
* address changes
* address changes
* fix: fieldMask are actually shared with different context.
* address changes
* address changes
Diffstat (limited to 'Firestore/Source/Model/FSTDocument.mm')
| -rw-r--r-- | Firestore/Source/Model/FSTDocument.mm | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/Firestore/Source/Model/FSTDocument.mm b/Firestore/Source/Model/FSTDocument.mm index 58d3629..ca66da1 100644 --- a/Firestore/Source/Model/FSTDocument.mm +++ b/Firestore/Source/Model/FSTDocument.mm @@ -19,9 +19,14 @@ #import "Firestore/Source/Core/FSTSnapshotVersion.h" #import "Firestore/Source/Model/FSTDocumentKey.h" #import "Firestore/Source/Model/FSTFieldValue.h" -#import "Firestore/Source/Model/FSTPath.h" #import "Firestore/Source/Util/FSTAssert.h" +#include "Firestore/core/src/firebase/firestore/model/field_path.h" +#include "Firestore/core/src/firebase/firestore/util/string_apple.h" + +namespace util = firebase::firestore::util; +using firebase::firestore::model::FieldPath; + NS_ASSUME_NONNULL_BEGIN @interface FSTMaybeDocument () @@ -99,7 +104,7 @@ NS_ASSUME_NONNULL_BEGIN self.localMutations ? @"YES" : @"NO", self.data]; } -- (nullable FSTFieldValue *)fieldForPath:(FSTFieldPath *)path { +- (nullable FSTFieldValue *)fieldForPath:(const FieldPath &)path { return [_data valueForPath:path]; } |