Skip to content

Remove the Firestore patch for the Windows decltype of captured lambda build error #1097

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 2 commits into from
Closed

Remove the Firestore patch for the Windows decltype of captured lambda build error #1097

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8e84457
Remove the M121 Firestore patch for LocalStore added in https://githu…
dconeybe Oct 3, 2022
68f8c15
Merge branch 'main' into dconeybe/FixRemoveLocalStorePatch
dconeybe Oct 11, 2022
File filter

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 0 additions & 18 deletions cmake/external/firestore.patch.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,21 +80,3 @@ index 96353b65f..57f159e9c 100644
private:
friend bool operator==(const FieldIndex& lhs, const FieldIndex& rhs);
friend bool operator!=(const FieldIndex& lhs, const FieldIndex& rhs);
diff --git a/Firestore/core/test/unit/local/leveldb_local_store_test.cc b/Firestore/core/test/unit/local/leveldb_local_store_test.cc
index 4813b9816..54f24e90b 100644
--- a/Firestore/core/test/unit/local/leveldb_local_store_test.cc
+++ b/Firestore/core/test/unit/local/leveldb_local_store_test.cc
@@ -69,12 +69,7 @@ std::unique_ptr<LocalStoreTestHelper> Factory() {
// This lambda function takes a rvalue vector as parameter,
// then coverts it to a sorted set based on the compare function.
auto convertToSet = [](std::vector<FieldIndex>&& vec) {
- auto cmp = [](const FieldIndex& left, const FieldIndex& right) {
- return FieldIndex::SemanticCompare(left, right) ==
- util::ComparisonResult::Ascending;
- };
-
- std::set<FieldIndex, decltype(cmp)> result(cmp);
+ std::set<FieldIndex, FieldIndex::SemanticLess> result;
for (auto& index : vec) {
result.insert(std::move(index));
}