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

Merge pull request #6080 from sloriot/PMP-max_w 

Workaround compilation error on Windows, about `max`
This commit is contained in:
Laurent Rineau 2021-10-29 16:59:22 +02:00
parent 779145da52 f4f484c5e0
commit 04cde86a24
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/self_intersections.h
View File

@ -63,14 +63,14 @@ template<typename Output_iterator>
struct Throw_at_count_reached_functor { struct Throw_at_count_reached_functor {
std::atomic<unsigned int>& counter; std::atomic<unsigned int>& counter;
const unsigned int& max; const unsigned int& maxval;
Output_iterator out; Output_iterator out;
Throw_at_count_reached_functor(std::atomic<unsigned int>& counter, Throw_at_count_reached_functor(std::atomic<unsigned int>& counter,
const unsigned int& max, const unsigned int& maxval,
Output_iterator out) Output_iterator out)
: counter(counter), max(max), out(out) : counter(counter), maxval(maxval), out(out)
{} {}
template<class T> template<class T>
@ -78,7 +78,7 @@ struct Throw_at_count_reached_functor {
{ {
*out++ = t; *out++ = t;
++counter; ++counter;
if(counter >= max) if(counter >= maxval)
{ {
throw CGAL::internal::Throw_at_output_exception(); throw CGAL::internal::Throw_at_output_exception();
} }