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/core/src/firebase/firestore/model | |
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/core/src/firebase/firestore/model')
-rw-r--r-- | Firestore/core/src/firebase/firestore/model/field_path.h | 10 | ||||
-rw-r--r-- | Firestore/core/src/firebase/firestore/model/resource_path.h | 5 |
2 files changed, 2 insertions, 13 deletions
diff --git a/Firestore/core/src/firebase/firestore/model/field_path.h b/Firestore/core/src/firebase/firestore/model/field_path.h index fdf4918..ce3527d 100644 --- a/Firestore/core/src/firebase/firestore/model/field_path.h +++ b/Firestore/core/src/firebase/firestore/model/field_path.h @@ -48,6 +48,8 @@ class FieldPath : public impl::BasePath<FieldPath> { } FieldPath(std::initializer_list<std::string> list) : BasePath{list} { } + explicit FieldPath(SegmentsT&& segments) : BasePath{std::move(segments)} { + } /** * Creates and returns a new path from the server formatted field-path string, @@ -83,14 +85,6 @@ class FieldPath : public impl::BasePath<FieldPath> { bool operator>=(const FieldPath& rhs) const { return BasePath::operator>=(rhs); } - - private: - explicit FieldPath(SegmentsT&& segments) : BasePath{std::move(segments)} { - } - - // So that methods of base can construct FieldPath using the private - // constructor. - friend class BasePath; }; } // namespace model diff --git a/Firestore/core/src/firebase/firestore/model/resource_path.h b/Firestore/core/src/firebase/firestore/model/resource_path.h index 6ff1b68..acdf1e2 100644 --- a/Firestore/core/src/firebase/firestore/model/resource_path.h +++ b/Firestore/core/src/firebase/firestore/model/resource_path.h @@ -70,11 +70,6 @@ class ResourcePath : public impl::BasePath<ResourcePath> { bool operator>=(const ResourcePath& rhs) const { return BasePath::operator>=(rhs); } - - private: - // So that methods of base can construct ResourcePath using the private - // constructor. - friend class BasePath; }; } // namespace model |