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

Merge branch 'CGAL-fix_MSVC_warnings_with_TBB-lrineau' into releases/CGAL-4.5-branch 

Tested in CGAL-4.5.2-Ic-178.
Approved by the Release Manager.
This commit is contained in:
Laurent Rineau 2015-01-28 18:12:53 +01:00
parent 626ec7a144 72e0a3e677
commit 351e73373f
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Mesh_3/include/CGAL/Mesh_3/Worksharing_data_structures.h
View File

@ -690,7 +690,7 @@ protected:
}
const int NUM_WORK_ITEMS_PER_BATCH;
const size_t NUM_WORK_ITEMS_PER_BATCH;
int m_num_cells_per_axis;
int m_num_cells;

2
Triangulation_3/include/CGAL/Delaunay_triangulation_3.h
View File

@ -340,7 +340,7 @@ public:
}
#endif // CGAL_CONCURRENT_TRIANGULATION_3_ADD_TEMPORARY_POINTS_ON_FAR_SPHERE
int i = 0;
size_t i = 0;
// Insert "num_points_seq" points sequentially
// (or more if dim < 3 after that)
size_t num_points_seq = (std::min)(num_points, (size_t)100);

2
Triangulation_3/include/CGAL/Regular_triangulation_3.h
View File

@ -274,7 +274,7 @@ namespace CGAL {
}
#endif // CGAL_CONCURRENT_TRIANGULATION_3_ADD_TEMPORARY_POINTS_ON_FAR_SPHERE
int i = 0;
size_t i = 0;
// Insert "num_points_seq" points sequentially
// (or more if dim < 3 after that)
size_t num_points_seq = (std::min)(num_points, (size_t)500);