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

fix conversion warnings (for msvc)

This commit is contained in:
Jane Tournois 2015-11-17 16:11:53 +01:00
parent 701519e48f
commit 265eb559c0
3 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Operations_on_polyhedra/include/CGAL/intersection_of_Polyhedra_3_refinement_visitor.h
View File

@ -1855,7 +1855,8 @@ public:
internal_IOP::Non_intersection_halfedge<Polyhedron> criterium(border_halfedges); internal_IOP::Non_intersection_halfedge<Polyhedron> criterium(border_halfedges);
int mark_index=final_map().get_new_mark(); //mark used to tag dart that are on an intersection int mark_index = static_cast<int>(final_map().get_new_mark());
//mark used to tag dart that are on an intersection
//define a map that will contain the correspondance between selected halfedges of the boundary and //define a map that will contain the correspondance between selected halfedges of the boundary and
//their corresponding Dart_handle in the cmap. //their corresponding Dart_handle in the cmap.

2
Polyhedron/demo/Polyhedron/Polyhedron_demo_point_set_shape_detection_plugin.cpp
View File

@ -283,7 +283,7 @@ void Polyhedron_demo_point_set_shape_detection_plugin::build_alpha_shape
if (ashape.classify (it) != Alpha_shape_2::INTERIOR) if (ashape.classify (it) != Alpha_shape_2::INTERIOR)
continue; continue;
for (std::size_t i = 0; i < 3; ++ i) for (int i = 0; i < 3; ++ i)
{ {
if (map_v2i.find (it->vertex (i)) == map_v2i.end ()) if (map_v2i.find (it->vertex (i)) == map_v2i.end ())
{ {

6
Polyhedron/demo/Polyhedron/Scene_combinatorial_map_item.cpp
View File

@ -236,8 +236,10 @@ void Scene_combinatorial_map_item::compute_elements(void) const{
//Facets //Facets
{ {
std::size_t index = 0; std::size_t index = 0;
int voltreated = combinatorial_map().get_new_mark(); Combinatorial_map_3::size_type voltreated
int facetreated = combinatorial_map().get_new_mark(); = combinatorial_map().get_new_mark();
Combinatorial_map_3::size_type facetreated
= combinatorial_map().get_new_mark();
Combinatorial_map_3::Dart_const_range::const_iterator Combinatorial_map_3::Dart_const_range::const_iterator
darts_it=combinatorial_map().darts().begin(), darts_end=combinatorial_map().darts().end(); darts_it=combinatorial_map().darts().begin(), darts_end=combinatorial_map().darts().end();
for( ; darts_it!=darts_end; ++darts_it) for( ; darts_it!=darts_end; ++darts_it)