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

Apply suggestions from code review 

Co-authored-by: Mael <mael.rouxel.labbe@geometryfactory.com>
This commit is contained in:
Sebastien Loriot 2021-12-17 10:17:13 +01:00 committed by GitHub
parent 0183aac332
commit bd6408a772
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
STL_Extension/include/CGAL/STL_Extension/internal/boost/relaxed_heap.hpp
View File

@ -13,9 +13,9 @@
// $Id$ // $Id$
// SPDX-License-Identifier: BSL-1.0 // SPDX-License-Identifier: BSL-1.0
// //
// NOTE: this file have been taken from boost 1.77 for using // NOTE: this file has been taken from boost 1.77 to use
// with Modificable_priority_queue // with Modificable_priority_queue.
// original file is <boost/pending/relaxed_heap.hpp> // The original file is <boost/pending/relaxed_heap.hpp>
// //
#ifndef BOOST_RELAXED_HEAP_HEADER #ifndef BOOST_RELAXED_HEAP_HEADER

4
Surface_mesh_simplification/doc/Surface_mesh_simplification/CGAL/Surface_mesh_simplification/edge_collapse.h
View File

@ -93,8 +93,8 @@ the number of edges effectively removed.
\cgalParamType{Either `CGAL::Tag_true` or `CGAL::Tag_false`} \cgalParamType{Either `CGAL::Tag_true` or `CGAL::Tag_false`}
\cgalParamDefault{`CGAL::Tag_false()`} \cgalParamDefault{`CGAL::Tag_false()`}
\cgalParamExtra{Using a relaxed order will allow the algorithm to use a faster priority queue. \cgalParamExtra{Using a relaxed order will allow the algorithm to use a faster priority queue.
However, if for example a user expects that all elements shorter than a given value to be collapsed, However, the ordering of the priority queue is no longer strict and there is a possibility
a relaxed order shall not be used.} that some elements that ought to have been collapsed are not actually collapsed.}
\cgalParamNEnd \cgalParamNEnd
\cgalNamedParamsEnd \cgalNamedParamsEnd

1
Surface_mesh_simplification/include/CGAL/Surface_mesh_simplification/internal/Edge_collapse.h
View File

@ -313,7 +313,6 @@ private:
CGAL_expensive_assertion(mPQ->contains(h)); CGAL_expensive_assertion(mPQ->contains(h));
mPQ->update(h); mPQ->update(h);
data.set_is_in_PQ();
CGAL_assertion(data.is_in_PQ()); CGAL_assertion(data.is_in_PQ());
CGAL_expensive_assertion(mPQ->contains(h)); CGAL_expensive_assertion(mPQ->contains(h));