From fea5528a5caf8477b3406977533e6bfbc96e89d7 Mon Sep 17 00:00:00 2001 From: albert-github Date: Wed, 28 Sep 2022 18:59:31 +0200 Subject: [PATCH 1/2] STL_Extension: worng formulation of precondition In STL_Extension/classCGAL_1_1In__place__list.html we see the line: ``` Both lists are increasingly sorted. A suitable operator< for the type T ``` the word `increasingly` means `more and more`, though most likely `in increasing order` is meant here --- STL_Extension/doc/STL_Extension/CGAL/In_place_list.h | 2 +- STL_Extension/include/CGAL/In_place_list.h | 7 ++++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/STL_Extension/doc/STL_Extension/CGAL/In_place_list.h b/STL_Extension/doc/STL_Extension/CGAL/In_place_list.h index 6ce33c5bd9d..d5dc49c9d13 100644 --- a/STL_Extension/doc/STL_Extension/CGAL/In_place_list.h +++ b/STL_Extension/doc/STL_Extension/CGAL/In_place_list.h @@ -723,7 +723,7 @@ void unique(); /*! merges the list `ipl2` into the list `ipl` and `ipl2` becomes empty. It is stable. -\pre Both lists are increasingly sorted. A suitable `operator<` for the type `T`. +\pre Both lists are sorted in increasing order by means of a suitable `operator<` for the type `T`. */ void merge(In_place_list& ipl2); diff --git a/STL_Extension/include/CGAL/In_place_list.h b/STL_Extension/include/CGAL/In_place_list.h index 9c99f2e9a8f..c6c936275b2 100644 --- a/STL_Extension/include/CGAL/In_place_list.h +++ b/STL_Extension/include/CGAL/In_place_list.h @@ -575,14 +575,15 @@ public: void merge(Self& x); // merges the list x into the list `l' and x becomes empty. It is - // stable. Precondition: Both lists are increasingly sorted. A - // suitable `operator<' for the type T. + // stable. Precondition: Both lists are sorted in increasing order + // by means of a suitable `operator<` for the type `T`. template < class StrictWeakOrdering > void merge(Self& x, StrictWeakOrdering ord) // merges the list x into the list `l' and x becomes empty. // It is stable. - // Precondition: Both lists are increasingly sorted wrt. ord. + // stable. Precondition: Both lists are sorted in increasing order + // wrt. ord. { iterator first1 = begin(); iterator last1 = end(); From 39c752dfd138309a9fb5e1e07114fa2deaaa5723 Mon Sep 17 00:00:00 2001 From: albert-github Date: Thu, 29 Sep 2022 10:32:10 +0200 Subject: [PATCH 2/2] Update STL_Extension/include/CGAL/In_place_list.h Co-authored-by: Mael --- STL_Extension/include/CGAL/In_place_list.h | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/STL_Extension/include/CGAL/In_place_list.h b/STL_Extension/include/CGAL/In_place_list.h index c6c936275b2..246453abeab 100644 --- a/STL_Extension/include/CGAL/In_place_list.h +++ b/STL_Extension/include/CGAL/In_place_list.h @@ -582,8 +582,7 @@ public: void merge(Self& x, StrictWeakOrdering ord) // merges the list x into the list `l' and x becomes empty. // It is stable. - // stable. Precondition: Both lists are sorted in increasing order - // wrt. ord. + // Precondition: Both lists are sorted in increasing order wrt. `ord`. { iterator first1 = begin(); iterator last1 = end();