From c65267188fe4f29fa415aca88e4a3840d15348af Mon Sep 17 00:00:00 2001 From: Daniel Arndt Date: Thu, 13 Jul 2023 08:43:10 -0400 Subject: [PATCH] Only warn about deprecated std_cxx17 headers for DEAL_II_EARLY_DEPRECATIONS --- include/deal.II/base/std_cxx17/algorithm.h | 4 +++- include/deal.II/base/std_cxx17/optional.h | 4 +++- include/deal.II/base/std_cxx17/tuple.h | 4 +++- include/deal.II/base/std_cxx17/variant.h | 4 +++- 4 files changed, 12 insertions(+), 4 deletions(-) diff --git a/include/deal.II/base/std_cxx17/algorithm.h b/include/deal.II/base/std_cxx17/algorithm.h index 3231bfe295..807b472a56 100644 --- a/include/deal.II/base/std_cxx17/algorithm.h +++ b/include/deal.II/base/std_cxx17/algorithm.h @@ -17,8 +17,10 @@ #include +#ifdef DEAL_II_EARLY_DEPRECATIONS DEAL_II_WARNING( - "This file is deprecated. Simply use the corresponding C++14 header .") + "This file is deprecated. Simply use the corresponding C++17 header .") +#endif #include diff --git a/include/deal.II/base/std_cxx17/optional.h b/include/deal.II/base/std_cxx17/optional.h index 510857a6d2..2653eeab35 100644 --- a/include/deal.II/base/std_cxx17/optional.h +++ b/include/deal.II/base/std_cxx17/optional.h @@ -17,8 +17,10 @@ #include +#ifdef DEAL_II_EARLY_DEPRECATIONS DEAL_II_WARNING( - "This file is deprecated. Simply use the corresponding C++14 header .") + "This file is deprecated. Simply use the corresponding C++17 header .") +#endif #include diff --git a/include/deal.II/base/std_cxx17/tuple.h b/include/deal.II/base/std_cxx17/tuple.h index 8e78e93b94..a43e54df05 100644 --- a/include/deal.II/base/std_cxx17/tuple.h +++ b/include/deal.II/base/std_cxx17/tuple.h @@ -17,8 +17,10 @@ #include +#ifdef DEAL_II_EARLY_DEPRECATIONS DEAL_II_WARNING( - "This file is deprecated. Simply use the corresponding C++14 header .") + "This file is deprecated. Simply use the corresponding C++17 header .") +#endif #include diff --git a/include/deal.II/base/std_cxx17/variant.h b/include/deal.II/base/std_cxx17/variant.h index a7d42b74b9..a159ab1d2f 100644 --- a/include/deal.II/base/std_cxx17/variant.h +++ b/include/deal.II/base/std_cxx17/variant.h @@ -17,8 +17,10 @@ #include +#ifdef DEAL_II_EARLY_DEPRECATIONS DEAL_II_WARNING( - "This file is deprecated. Simply use the corresponding C++14 header .") + "This file is deprecated. Simply use the corresponding C++17 header .") +#endif #include -- 2.39.5