From 9bb15732c93ff6075d058422f8f1bf4b6be93cfe Mon Sep 17 00:00:00 2001 From: Timo Heister Date: Fri, 8 May 2020 10:54:48 -0400 Subject: [PATCH] hide boost deprecation warning with 1.73 boost 1.73 deprecated boost/bind.hpp but uses it internally. Defining this macro silences the warnings. fixes #10090 --- source/base/parameter_handler.cc | 4 ++++ source/base/patterns.cc | 4 ++++ source/base/utilities.cc | 4 +++- source/dofs/dof_renumbering.cc | 2 ++ 4 files changed, 13 insertions(+), 1 deletion(-) diff --git a/source/base/parameter_handler.cc b/source/base/parameter_handler.cc index 4887933456..dce5b410a6 100644 --- a/source/base/parameter_handler.cc +++ b/source/base/parameter_handler.cc @@ -20,11 +20,15 @@ #include #include +DEAL_II_DISABLE_EXTRA_DIAGNOSTICS +#define BOOST_BIND_GLOBAL_PLACEHOLDERS #include #include #include #include #include +#undef BOOST_BIND_GLOBAL_PLACEHOLDERS +DEAL_II_ENABLE_EXTRA_DIAGNOSTICS #include #include diff --git a/source/base/patterns.cc b/source/base/patterns.cc index 37edd78b98..cc9a4b90bf 100644 --- a/source/base/patterns.cc +++ b/source/base/patterns.cc @@ -20,10 +20,14 @@ #include #include +DEAL_II_DISABLE_EXTRA_DIAGNOSTICS +#define BOOST_BIND_GLOBAL_PLACEHOLDERS #include #include #include #include +#undef BOOST_BIND_GLOBAL_PLACEHOLDERS +DEAL_II_ENABLE_EXTRA_DIAGNOSTICS #include #include diff --git a/source/base/utilities.cc b/source/base/utilities.cc index ef0db02b21..92c7ffcc3c 100644 --- a/source/base/utilities.cc +++ b/source/base/utilities.cc @@ -28,13 +28,15 @@ #include #include +DEAL_II_DISABLE_EXTRA_DIAGNOSTICS +#define BOOST_BIND_GLOBAL_PLACEHOLDERS #include #include #include -DEAL_II_DISABLE_EXTRA_DIAGNOSTICS #include #include #include +#undef BOOST_BIND_GLOBAL_PLACEHOLDERS DEAL_II_ENABLE_EXTRA_DIAGNOSTICS #include diff --git a/source/dofs/dof_renumbering.cc b/source/dofs/dof_renumbering.cc index b70eb8fe1c..bfabdb6812 100644 --- a/source/dofs/dof_renumbering.cc +++ b/source/dofs/dof_renumbering.cc @@ -42,6 +42,7 @@ #include DEAL_II_DISABLE_EXTRA_DIAGNOSTICS +#define BOOST_BIND_GLOBAL_PLACEHOLDERS #include #include #include @@ -51,6 +52,7 @@ DEAL_II_DISABLE_EXTRA_DIAGNOSTICS #include #include #include +#undef BOOST_BIND_GLOBAL_PLACEHOLDERS DEAL_II_ENABLE_EXTRA_DIAGNOSTICS #include -- 2.39.5