From: Daniel Arndt Date: Thu, 13 Jul 2023 12:43:10 +0000 (-0400) Subject: Only warn about deprecated std_cxx17 headers for DEAL_II_EARLY_DEPRECATIONS X-Git-Tag: relicensing~684^2 X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c65267188fe4f29fa415aca88e4a3840d15348af;p=dealii.git Only warn about deprecated std_cxx17 headers for DEAL_II_EARLY_DEPRECATIONS --- 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