From 9e815620e9f7f43b42e03db4e5118d7ad03ddee7 Mon Sep 17 00:00:00 2001
From: zxu <zxu@google.com>
Date: Wed, 14 Mar 2018 08:57:31 -0400
Subject: 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
---
 Firestore/core/src/firebase/firestore/model/field_path.h    | 10 ++--------
 Firestore/core/src/firebase/firestore/model/resource_path.h |  5 -----
 2 files changed, 2 insertions(+), 13 deletions(-)

(limited to 'Firestore/core/src/firebase/firestore/model')

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
-- 
cgit v1.2.3