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

fix warnings cherry-picked from master targetting 5.4

This commit is contained in:
Sébastien Loriot 2021-11-29 18:02:31 +01:00
parent 993a7b29b0
commit 676c367852
4 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
NewKernel_d/include/CGAL/NewKernel_d/LA_eigen/constructors.h
View File

@ -92,7 +92,7 @@ namespace CGAL {
struct Initializer_list { struct Initializer_list {
result_type operator()(std::initializer_list<NT> l) const { result_type operator()(std::initializer_list<NT> l) const {
return Iterator()(l.size(),l.begin(),l.end()); return Iterator()(static_cast<int>(l.size()),l.begin(),l.end());
} }
}; };

4
Periodic_3_mesh_3/include/CGAL/Periodic_3_mesh_3/Protect_edges_sizing_field.h
View File

@ -2113,8 +2113,10 @@ insert_balls(const Vertex_handle& vp,
curve_index, d_sign) curve_index, d_sign)
<< ")\n"; << ")\n";
#endif #endif
const FT sgn = (d_sign == CGAL::POSITIVE) ? 1.
: (d_sign == CGAL::NEGATIVE ? -1. : 0.);
const Bare_point new_point = const Bare_point new_point =
domain_.construct_point_on_curve(vpp, curve_index, d_sign * d / 2); domain_.construct_point_on_curve(vpp, curve_index, sgn * d / 2);
const int dim = 1; // new_point is on edge const int dim = 1; // new_point is on edge
const Index index = domain_.index_from_curve_index(curve_index); const Index index = domain_.index_from_curve_index(curve_index);
const FT point_weight = CGAL::square(size_(new_point, dim, index)); const FT point_weight = CGAL::square(size_(new_point, dim, index));

2
Point_set_processing_3/include/CGAL/pointmatcher/compute_registration_transformation.h
View File

@ -78,7 +78,7 @@ construct_icp(const NamedParameters1& np1, const NamedParameters2& np2)
icp.setDefault(); icp.setDefault();
const ICP_config null_config { "_null_pm_config_in_cgal" }; const ICP_config null_config { /*.name=*/"_null_pm_config_in_cgal", /*.params=*/{ } };
const std::vector<ICP_config> null_config_chain { null_config }; const std::vector<ICP_config> null_config_chain { null_config };
auto is_null_config = [&](const ICP_config& c) { return !c.name.compare(null_config.name); }; auto is_null_config = [&](const ICP_config& c) { return !c.name.compare(null_config.name); };

2
Polyhedron/demo/Polyhedron/include/CGAL/Polyhedron_kernel.h
View File

@ -94,7 +94,7 @@ public:
lp.set_a(index_x4, j, -1.0); // -x4 lp.set_a(index_x4, j, -1.0); // -x4
// right hand side (>= -dj) // right hand side (>= -dj)
FT dj = distance_to_origin(plane) * CGAL::sign(plane.d()); FT dj = distance_to_origin(plane) * static_cast<int>(CGAL::sign(plane.d()));
lp.set_b(j, -dj); lp.set_b(j, -dj);
} }