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

fix more warnings

This commit is contained in:
Sébastien Loriot 2022-07-06 12:58:49 +02:00
parent ddd0e7dd47
commit 45b5fd43f8
6 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Arrangement_on_surface_2/demo/Arrangement_on_surface_2/ArrangementPainterOstream.cpp
View File

@ -289,7 +289,7 @@ ArrangementPainterOstream<CGAL::Arr_linear_traits_2<Kernel_>>::operator<<(
QRectF seg_bb = this->convert(seg.bbox()); QRectF seg_bb = this->convert(seg.bbox());
if ( if (
this->clippingRect.isValid() && this->clippingRect.isValid() &&
!this->clippingRect.intersects(seg_bb) & !this->clippingRect.intersects(seg_bb) &&
(!seg.is_horizontal() && !seg.is_vertical())) (!seg.is_horizontal() && !seg.is_vertical()))
{ return *this; } { return *this; }

2
Kernel_23/include/CGAL/Kernel_23/internal/Projection_traits_3.h
View File

@ -960,7 +960,7 @@ public:
Equal_x_2 eqx; Equal_x_2 eqx;
Equal_y_2 eqy; Equal_y_2 eqy;
return eqx(p,q) & eqy(p,q); return eqx(p,q) && eqy(p,q);
} }
}; };

9
Mesh_3/include/CGAL/Mesh_3/search_for_connected_components_in_labeled_image.h
View File

@ -73,11 +73,18 @@ search_for_connected_components_in_labeled_image(const CGAL::Image_3& image,
for(uint i=0; i<nx; i++) for(uint i=0; i<nx; i++)
{ {
using CGAL::IMAGEIO::static_evaluate; using CGAL::IMAGEIO::static_evaluate;
#ifdef __GNUC__
# pragma GCC diagnostic push
# pragma GCC diagnostic ignored "-Wunknown-warning-option"
# pragma GCC diagnostic ignored "-Wbitwise-instead-of-logical"
#endif
if(visited[voxel_index] | second_pass[voxel_index]) { if(visited[voxel_index] | second_pass[voxel_index]) {
++voxel_index; ++voxel_index;
continue; continue;
} }
#ifdef __GNUC__
# pragma GCC diagnostic pop
#endif
const Label current_label = const Label current_label =
transform(static_evaluate<Image_word_type>(image.image(), transform(static_evaluate<Image_word_type>(image.image(),
voxel_index)); voxel_index));

2
Number_types/include/CGAL/GMP/Gmpzf_type.h
View File

@ -157,7 +157,7 @@ public:
return; return;
} }
const int p = std::numeric_limits<double>::digits; const int p = std::numeric_limits<double>::digits;
CGAL_assertion(CGAL_NTS is_finite(d) & is_valid(d)); CGAL_assertion(CGAL_NTS is_finite(d) && is_valid(d));
int exp; int exp;
double x = std::frexp(d, &exp); // x in [1/2, 1], x*2^exp = d double x = std::frexp(d, &exp); // x in [1/2, 1], x*2^exp = d
mpz_init_set_d (man(), // to the following integer: mpz_init_set_d (man(), // to the following integer:

2
Number_types/include/CGAL/MP_Float.h
View File

@ -762,7 +762,7 @@ namespace INTERN_MP_FLOAT {
while (true) { while (true) {
x = x % y; x = x % y;
if (x == 0) { if (x == 0) {
CGAL_postcondition(internal::divides(y, a) & internal::divides(y, b)); CGAL_postcondition(internal::divides(y, a) && internal::divides(y, b));
y.gcd_normalize(); y.gcd_normalize();
return y; return y;
} }

2
Straight_skeleton_2/include/CGAL/constructions/Straight_skeleton_cons_ftC2.h
View File

@ -45,7 +45,7 @@ bool are_parallel_edges_equally_oriented( Segment_2_with_ID<K> const& e0, Segmen
template<class K> template<class K>
bool are_edges_orderly_collinear( Segment_2_with_ID<K> const& e0, Segment_2_with_ID<K> const& e1 ) bool are_edges_orderly_collinear( Segment_2_with_ID<K> const& e0, Segment_2_with_ID<K> const& e1 )
{ {
return are_edges_collinear(e0,e1) & are_parallel_edges_equally_oriented(e0,e1); return are_edges_collinear(e0,e1) && are_parallel_edges_equally_oriented(e0,e1);
} }