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

Prevent name conflict with min/max

This commit is contained in:
Clement Jamin 2014-09-19 12:22:36 +02:00
parent 0040d62791
commit 9a1c16fc9f
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Triangulation/include/CGAL/Delaunay_triangulation.h
View File

@ -463,7 +463,7 @@ Delaunay_triangulation<DCTraits, TDS>
maximal_dimension(), maximal_dimension(),
flat_orientation_ ? flat_orientation_ ?
std::pair<int, const Flat_orientation_d *>(current_dimension(), flat_orientation_.get_ptr()) std::pair<int, const Flat_orientation_d *>(current_dimension(), flat_orientation_.get_ptr())
: std::pair<int, const Flat_orientation_d *>(std::numeric_limits<int>::max(), NULL) ); : std::pair<int, const Flat_orientation_d *>((std::numeric_limits<int>::max)(), NULL) );
Dark_s_handle dark_s; Dark_s_handle dark_s;
Dark_v_handle dark_v; Dark_v_handle dark_v;

4
Triangulation/include/CGAL/Triangulation.h
View File

@ -234,7 +234,7 @@ public:
, kernel_(k) , kernel_(k)
, infinity_() , infinity_()
, rng_((long)0) , rng_((long)0)
, preset_flat_orientation_(std::numeric_limits<int>::max(), NULL) , preset_flat_orientation_((std::numeric_limits<int>::max)(), NULL)
#ifdef CGAL_TRIANGULATION_STATISTICS #ifdef CGAL_TRIANGULATION_STATISTICS
,walk_size_(0) ,walk_size_(0)
#endif #endif
@ -268,7 +268,7 @@ public:
, kernel_(t2.kernel_) , kernel_(t2.kernel_)
, infinity_() , infinity_()
, rng_(t2.rng_) , rng_(t2.rng_)
, preset_flat_orientation_(std::numeric_limits<int>::max(), NULL) , preset_flat_orientation_((std::numeric_limits<int>::max)(), NULL)
#ifdef CGAL_TRIANGULATION_STATISTICS #ifdef CGAL_TRIANGULATION_STATISTICS
,walk_size_(t2.walk_size_) ,walk_size_(t2.walk_size_)
#endif #endif