songsenand
/
cgal
mirror of https://github.com/CGAL/cgal
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #6910 from albert-github/feature/bug_STL_Extension_increasingly 

STL_Extension: wrong formulation of precondition
This commit is contained in:
Laurent Rineau 2022-10-07 15:46:49 +02:00
parent b408e1dc9c 39c752dfd1
commit b51fb86202
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
STL_Extension/doc/STL_Extension/CGAL/In_place_list.h
View File

@ -723,7 +723,7 @@ void unique();
/*! /*!
merges the list `ipl2` merges the list `ipl2`
into the list `ipl` and `ipl2` becomes empty. It is stable. 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<T,bool>& ipl2); void merge(In_place_list<T,bool>& ipl2);

6
STL_Extension/include/CGAL/In_place_list.h
View File

@ -575,14 +575,14 @@ public:
void merge(Self& x); void merge(Self& x);
// merges the list x into the list `l' and x becomes empty. It is // merges the list x into the list `l' and x becomes empty. It is
// stable. Precondition: Both lists are increasingly sorted. A // stable. Precondition: Both lists are sorted in increasing order
// suitable `operator<' for the type T. // by means of a suitable `operator<` for the type `T`.
template < class StrictWeakOrdering > template < class StrictWeakOrdering >
void merge(Self& x, StrictWeakOrdering ord) void merge(Self& x, StrictWeakOrdering ord)
// merges the list x into the list `l' and x becomes empty. // merges the list x into the list `l' and x becomes empty.
// It is stable. // It is stable.
// Precondition: Both lists are increasingly sorted wrt. ord. // Precondition: Both lists are sorted in increasing order wrt. `ord`.
{ {
iterator first1 = begin(); iterator first1 = begin();
iterator last1 = end(); iterator last1 = end();