From: Matthias Maier Date: Wed, 1 Dec 2021 03:25:36 +0000 (-0600) Subject: Boost includes: use BOOST_ALLOW_DEPRECATED_HEADERS to suppress warnings X-Git-Tag: v9.3.3~7^2~2 X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=17e73e2965d04dc8f30ca01f73e0d7c9b0f12861;p=dealii.git Boost includes: use BOOST_ALLOW_DEPRECATED_HEADERS to suppress warnings --- diff --git a/include/deal.II/base/bounding_box_data_out.h b/include/deal.II/base/bounding_box_data_out.h index 2dd9738de4..9fb382ff1e 100644 --- a/include/deal.II/base/bounding_box_data_out.h +++ b/include/deal.II/base/bounding_box_data_out.h @@ -28,7 +28,13 @@ #include DEAL_II_DISABLE_EXTRA_DIAGNOSTICS +#ifdef DEAL_II_BOOST_HAS_BROKEN_HEADER_DEPRECATIONS +# define BOOST_ALLOW_DEPRECATED_HEADERS +#endif #include +#ifdef DEAL_II_BOOST_HAS_BROKEN_HEADER_DEPRECATIONS +# undef BOOST_ALLOW_DEPRECATED_HEADERS +#endif #include DEAL_II_ENABLE_EXTRA_DIAGNOSTICS diff --git a/include/deal.II/grid/grid_tools.h b/include/deal.II/grid/grid_tools.h index 83b79d759d..54592d76ba 100644 --- a/include/deal.II/grid/grid_tools.h +++ b/include/deal.II/grid/grid_tools.h @@ -51,7 +51,6 @@ DEAL_II_DISABLE_EXTRA_DIAGNOSTICS # include # include -# include # include # include # include diff --git a/include/deal.II/numerics/rtree.h b/include/deal.II/numerics/rtree.h index d885d8cbc2..32fbca7621 100644 --- a/include/deal.II/numerics/rtree.h +++ b/include/deal.II/numerics/rtree.h @@ -32,7 +32,13 @@ DEAL_II_DISABLE_EXTRA_DIAGNOSTICS * can include rtree.hpp. Otherwise a compilation error within boost * headers is encountered. */ +#ifdef DEAL_II_BOOST_HAS_BROKEN_HEADER_DEPRECATIONS +# define BOOST_ALLOW_DEPRECATED_HEADERS +#endif #include +#ifdef DEAL_II_BOOST_HAS_BROKEN_HEADER_DEPRECATIONS +# undef BOOST_ALLOW_DEPRECATED_HEADERS +#endif DEAL_II_ENABLE_EXTRA_DIAGNOSTICS #include