# HG changeset patch # User Mike Becker # Date 1688748191 -7200 # Node ID 937f8b5d4a3f320a8d1805ebc29601065894923d # Parent 6fa38285c6b4c0279390f74368dce25e8745d0a1# Parent bcf788f3f6f5e73b57ae2909c052d7adff1b8c39 merge upstream changes diff -r 6fa38285c6b4 -r 937f8b5d4a3f src/cx/iterator.h --- a/src/cx/iterator.h Fri Jul 07 18:33:11 2023 +0200 +++ b/src/cx/iterator.h Fri Jul 07 18:43:11 2023 +0200 @@ -204,13 +204,13 @@ /** * Iterator value type. - * An iterator points to a certain element in an (possibly unbounded) chain of elements. + * An iterator points to a certain element in a (possibly unbounded) chain of elements. * Iterators that are based on collections (which have a defined "first" element), are supposed * to be "position-aware", which means that they keep track of the current index within the collection. * * @note Objects that are pointed to by an iterator are always mutable through that iterator. However, * this iterator cannot mutate the collection itself (add or remove elements) and any mutation of the - * collection by other means make this iterator invalid (regardless of what cxIteratorValid() returns). + * collection by other means makes this iterator invalid (regardless of what cxIteratorValid() returns). * * @see CxMutIterator */ diff -r 6fa38285c6b4 -r 937f8b5d4a3f src/cx/list.h --- a/src/cx/list.h Fri Jul 07 18:33:11 2023 +0200 +++ b/src/cx/list.h Fri Jul 07 18:43:11 2023 +0200 @@ -77,7 +77,7 @@ void (*destructor)(struct cx_list_s *list); /** - * Member function for inserting a single elements. + * Member function for inserting a single element. * Implementors SHOULD see to performant implementations for corner cases. */ int (*insert_element)( @@ -145,7 +145,7 @@ ); /** - * Member function for sorting the list in place. + * Member function for sorting the list in-place. */ void (*sort)(struct cx_list_s *list); @@ -584,7 +584,7 @@ } /** - * Sorts the list in place. + * Sorts the list in-place. * * \remark The underlying sort algorithm is implementation defined. *