From 2b19cc2ba2f50479960d51e0783d2492d0cb3cd0 Mon Sep 17 00:00:00 2001 From: Marek Gilbert Date: Thu, 8 Feb 2018 07:08:53 -0800 Subject: [PATCH 1/2] Explicitly specify the default constructor to FieldPath Xcode prior to 8.3 does not accept an explicitly defaulted constructor (`= default`) for the purposes of default initializing a const object. This fixes a build failure under Xcode 8.2: Firestore/core/src/firebase/firestore/model/field_path.cc:144:26: error: default initialization of an object of const type 'const firebase::firestore::model::FieldPath' without a user-provided default constructor static const FieldPath empty_path; --- Firestore/core/src/firebase/firestore/model/field_path.h | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Firestore/core/src/firebase/firestore/model/field_path.h b/Firestore/core/src/firebase/firestore/model/field_path.h index a8b147ec012..7774bf72783 100644 --- a/Firestore/core/src/firebase/firestore/model/field_path.h +++ b/Firestore/core/src/firebase/firestore/model/field_path.h @@ -35,7 +35,9 @@ namespace model { */ class FieldPath : public impl::BasePath { public: - FieldPath() = default; + // Note: Xcode 8.2 requires explicit specification of the constructor. + FieldPath() : impl::BasePath() {} + /** Constructs the path from segments. */ template FieldPath(const IterT begin, const IterT end) : BasePath{begin, end} { From bf074c06f7b03dca77d2e18130cf8524744b3a31 Mon Sep 17 00:00:00 2001 From: Paul Beusterien Date: Thu, 8 Feb 2018 07:49:47 -0800 Subject: [PATCH 2/2] Fix style --- Firestore/core/src/firebase/firestore/model/field_path.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Firestore/core/src/firebase/firestore/model/field_path.h b/Firestore/core/src/firebase/firestore/model/field_path.h index 7774bf72783..00b658ab301 100644 --- a/Firestore/core/src/firebase/firestore/model/field_path.h +++ b/Firestore/core/src/firebase/firestore/model/field_path.h @@ -36,7 +36,8 @@ namespace model { class FieldPath : public impl::BasePath { public: // Note: Xcode 8.2 requires explicit specification of the constructor. - FieldPath() : impl::BasePath() {} + FieldPath() : impl::BasePath() { + } /** Constructs the path from segments. */ template