mirror of https://github.com/CGAL/cgal
handle older GCC versions
This commit is contained in:
parent
45b5fd43f8
commit
ad1e333538
|
|
@ -73,16 +73,16 @@ search_for_connected_components_in_labeled_image(const CGAL::Image_3& image,
|
|||
for(uint i=0; i<nx; i++)
|
||||
{
|
||||
using CGAL::IMAGEIO::static_evaluate;
|
||||
#ifdef __GNUC__
|
||||
#if defined(__GNUC__) && !defined(__clang__)
|
||||
# pragma GCC diagnostic push
|
||||
# pragma GCC diagnostic ignored "-Wunknown-warning-option"
|
||||
# pragma GCC diagnostic ignored "-Wpragmas"
|
||||
# pragma GCC diagnostic ignored "-Wbitwise-instead-of-logical"
|
||||
#endif
|
||||
if(visited[voxel_index] | second_pass[voxel_index]) {
|
||||
++voxel_index;
|
||||
continue;
|
||||
}
|
||||
#ifdef __GNUC__
|
||||
#if defined(__GNUC__) && !defined(__clang__)
|
||||
# pragma GCC diagnostic pop
|
||||
#endif
|
||||
const Label current_label =
|
||||
|
|
|
|||
|
|
@ -289,9 +289,9 @@ Uncertain<bool> operator!(Uncertain<bool> a)
|
|||
return Uncertain<bool>(!a.sup(), !a.inf());
|
||||
}
|
||||
|
||||
#ifdef __GNUC__
|
||||
#if defined(__GNUC__) && !defined(__clang__)
|
||||
# pragma GCC diagnostic push
|
||||
# pragma GCC diagnostic ignored "-Wunknown-warning-option"
|
||||
# pragma GCC diagnostic ignored "-Wpragmas"
|
||||
# pragma GCC diagnostic ignored "-Wbitwise-instead-of-logical"
|
||||
#endif
|
||||
inline
|
||||
|
|
@ -329,7 +329,7 @@ Uncertain<bool> operator&(Uncertain<bool> a, bool b)
|
|||
{
|
||||
return Uncertain<bool>(a.inf() & b, a.sup() & b);
|
||||
}
|
||||
#ifdef __GNUC__
|
||||
#if defined(__GNUC__) && !defined(__clang__)
|
||||
# pragma GCC diagnostic pop
|
||||
#endif
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue