Merge 5ce9b8f into 0b0785f

dconeybe · web-flow · commit 712c580575bd · 2022-09-16T09:38:21.000-04:00
diff --git a/Firestore/CHANGELOG.md b/Firestore/CHANGELOG.md
@@ -1,4 +1,7 @@
 # Unreleased
+- [fixed] Fixed compiler warning about `@param comparator` (#10226).
+
+# 9.6.0
 - [added] Expose client side indexing feature with `FIRFirestore.setIndexConfigurationFromJSON` and
   `FIRFirestore.setIndexConfigurationFromStream` (#10090).
 - [fixed] Fixed high CPU usage whenever Firestore was in use (#10168).
diff --git a/Firestore/core/src/util/set_util.h b/Firestore/core/src/util/set_util.h
@@ -36,7 +36,7 @@ namespace util {
  *
  * @param existing - The elements that exist in the original set.
  * @param new_entries - The elements to diff against the original set.
- * @param comparator - The comparator for the elements in before and after.
+ * @param cmp - The comparator for the elements in before and after.
  * @param on_add - A function to invoke for every element that is part of `
  * after` but not `before`.
  * @param on_remove - A function to invoke for every element that is part of

Original file line number	Diff line number	Diff line change
`@@ -36,7 +36,7 @@ namespace util {`
`36`	`36`	`*`
`37`	`37`	`* @param existing - The elements that exist in the original set.`
`38`	`38`	`* @param new_entries - The elements to diff against the original set.`
`39`		`- * @param comparator - The comparator for the elements in before and after.`
	`39`	`+ * @param cmp - The comparator for the elements in before and after.`
`40`	`40`	* @param on_add - A function to invoke for every element that is part of `
`41`	`41`	* after` but not `before`.
`42`	`42`	`* @param on_remove - A function to invoke for every element that is part of`