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

Fix warnings on MSVS2010.

This commit is contained in:
Stéphane Tayeb 2010-07-02 14:51:18 +00:00
parent 5c3be3f016
commit f2973b7ff0
6 changed files with 13 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Mesh_3/demo/Mesh_3/Scene_c3t3_item.cpp
View File

@ -351,7 +351,7 @@ Scene_c3t3_item::build_histogram()
painter.setPen(Qt::blue); painter.setPen(Qt::blue);
painter.drawLine(QPoint(left_margin, drawing_height + top_margin), painter.drawLine(QPoint(left_margin, drawing_height + top_margin),
QPoint(left_margin + histo_data.size()*cell_width, QPoint(left_margin + static_cast<int>(histo_data.size())*cell_width,
drawing_height + top_margin)); drawing_height + top_margin));

4
Mesh_3/include/CGAL/IO/File_medit.h
View File

@ -802,7 +802,9 @@ output_to_medit(std::ostream& os,
//------------------------------------------------------- //-------------------------------------------------------
// Facets // Facets
//------------------------------------------------------- //-------------------------------------------------------
int number_of_triangles = c3t3.number_of_facets(); unsigned int number_of_triangles =
static_cast<unsigned int>(c3t3.number_of_facets());
if ( print_each_facet_twice ) if ( print_each_facet_twice )
number_of_triangles += number_of_triangles; number_of_triangles += number_of_triangles;

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

@ -688,7 +688,7 @@ update_pvertex(PVertex& pv, const FT& sliver_bound) const
Cell_vector slivers = Cell_vector slivers =
helper_.incident_slivers(pv.vertex(), sliver_criterion_, sliver_bound); helper_.incident_slivers(pv.vertex(), sliver_criterion_, sliver_bound);
pv.set_sliver_nb(slivers.size()); pv.set_sliver_nb(static_cast<unsigned int>(slivers.size()));
pv.set_min_value(helper_.min_sliver_value(slivers, sliver_criterion_)); pv.set_min_value(helper_.min_sliver_value(slivers, sliver_criterion_));
} }

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

@ -82,7 +82,7 @@ lloyd_optimize_mesh_3_impl(C3T3& c3t3,
max_iteration_number = 1000; max_iteration_number = 1000;
// Launch optimization // Launch optimization
return opt(max_iteration_number); return opt(static_cast<int>(max_iteration_number));
} }

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

@ -83,7 +83,7 @@ odt_optimize_mesh_3_impl(C3T3& c3t3,
max_iteration_number = 1000; max_iteration_number = 1000;
// Launch optimization // Launch optimization
return opt(max_iteration_number); return opt(static_cast<int>(max_iteration_number));
} }
} // end namespace CGAL } // end namespace CGAL

13
Mesh_3/test/Mesh_3/test_meshing_utilities.h
View File

@ -52,15 +52,14 @@ struct Tester
const unsigned int min_cells_expected = 0, const unsigned int min_cells_expected = 0,
const unsigned int max_cells_expected = (unsigned int)(-1) ) const const unsigned int max_cells_expected = (unsigned int)(-1) ) const
{ {
typedef typename C3t3::size_type size_type;
typedef typename C3t3::Triangulation::Geom_traits Gt; typedef typename C3t3::Triangulation::Geom_traits Gt;
typedef typename CGAL::Mesh_3::Min_dihedral_angle_criterion<Gt> Sliver_criterion; typedef typename CGAL::Mesh_3::Min_dihedral_angle_criterion<Gt> Sliver_criterion;
typedef typename CGAL::Mesh_3::Slivers_exuder<C3t3, Sliver_criterion> Exuder; typedef typename CGAL::Mesh_3::Slivers_exuder<C3t3, Sliver_criterion> Exuder;
// Store mesh properties // Store mesh properties
size_type v = c3t3.triangulation().number_of_vertices(); unsigned int v = static_cast<unsigned int>(c3t3.triangulation().number_of_vertices());
size_type f = c3t3.number_of_facets(); unsigned int f = static_cast<unsigned int>(c3t3.number_of_facets());
size_type c = c3t3.number_of_cells(); unsigned int c = static_cast<unsigned int>(c3t3.number_of_cells());
// Verify // Verify
verify_c3t3(c3t3, verify_c3t3(c3t3,
@ -90,9 +89,9 @@ struct Tester
CGAL::parameters::no_exude(), CGAL::parameters::no_exude(),
CGAL::parameters::no_perturb()); CGAL::parameters::no_perturb());
v = c3t3.triangulation().number_of_vertices(); v = static_cast<unsigned int>(c3t3.triangulation().number_of_vertices());
f = c3t3.number_of_facets(); f = static_cast<unsigned int>(c3t3.number_of_facets());
c = c3t3.number_of_cells(); c = static_cast<unsigned int>(c3t3.number_of_cells());
} }
assert ( n < 11 ); assert ( n < 11 );
#endif #endif