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

handle older GCC versions

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

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

@ -73,16 +73,16 @@ 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__ #if defined(__GNUC__) && !defined(__clang__)
# pragma GCC diagnostic push # pragma GCC diagnostic push
# pragma GCC diagnostic ignored "-Wunknown-warning-option" # pragma GCC diagnostic ignored "-Wpragmas"
# pragma GCC diagnostic ignored "-Wbitwise-instead-of-logical" # pragma GCC diagnostic ignored "-Wbitwise-instead-of-logical"
#endif #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__ #if defined(__GNUC__) && !defined(__clang__)
# pragma GCC diagnostic pop # pragma GCC diagnostic pop
#endif #endif
const Label current_label = const Label current_label =

6
STL_Extension/include/CGAL/Uncertain.h
View File

@ -289,9 +289,9 @@ Uncertain<bool> operator!(Uncertain<bool> a)
return Uncertain<bool>(!a.sup(), !a.inf()); return Uncertain<bool>(!a.sup(), !a.inf());
} }
#ifdef __GNUC__ #if defined(__GNUC__) && !defined(__clang__)
# pragma GCC diagnostic push # pragma GCC diagnostic push
# pragma GCC diagnostic ignored "-Wunknown-warning-option" # pragma GCC diagnostic ignored "-Wpragmas"
# pragma GCC diagnostic ignored "-Wbitwise-instead-of-logical" # pragma GCC diagnostic ignored "-Wbitwise-instead-of-logical"
#endif #endif
inline inline
@ -329,7 +329,7 @@ Uncertain<bool> operator&(Uncertain<bool> a, bool b)
{ {
return Uncertain<bool>(a.inf() & b, a.sup() & b); return Uncertain<bool>(a.inf() & b, a.sup() & b);
} }
#ifdef __GNUC__ #if defined(__GNUC__) && !defined(__clang__)
# pragma GCC diagnostic pop # pragma GCC diagnostic pop
#endif #endif