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

also accomodate older versions of clang

This commit is contained in:
Sébastien Loriot 2022-07-08 20:15:29 +02:00
parent ad1e333538
commit 493795f95d
2 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

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

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

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