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 3231bfe295a0792b6be98f2f3c8459e57add977b..807b472a56b4b9427fe82d5a3b3651cc245f1bef 100644 (file)
--- a/include/deal.II/base/std_cxx17/algorithm.h
+++ b/include/deal.II/base/std_cxx17/algorithm.h
@@ -17,8 +17,10 @@
 
 #include <deal.II/base/config.h>
 
+#ifdef DEAL_II_EARLY_DEPRECATIONS
 DEAL_II_WARNING(
-  "This file is deprecated. Simply use the corresponding C++14 header <algorithm>.")
+  "This file is deprecated. Simply use the corresponding C++17 header <algorithm>.")
+#endif
 
 #include <algorithm>
 

diff --git a/include/deal.II/base/std_cxx17/optional.h b/include/deal.II/base/std_cxx17/optional.h
index 510857a6d2f50dc8bfc8ade793416208b78dde4d..2653eeab35ae2ea7b099c7b550ba6a0bca900897 100644 (file)
--- a/include/deal.II/base/std_cxx17/optional.h
+++ b/include/deal.II/base/std_cxx17/optional.h
@@ -17,8 +17,10 @@
 
 #include <deal.II/base/config.h>
 
+#ifdef DEAL_II_EARLY_DEPRECATIONS
 DEAL_II_WARNING(
-  "This file is deprecated. Simply use the corresponding C++14 header <optional>.")
+  "This file is deprecated. Simply use the corresponding C++17 header <optional>.")
+#endif
 
 #include <optional>
 

diff --git a/include/deal.II/base/std_cxx17/tuple.h b/include/deal.II/base/std_cxx17/tuple.h
index 8e78e93b94cec5e432a6f2f0f2e4a6e6494f588d..a43e54df05f337477ff239b056a105ff9ffb80ec 100644 (file)
--- a/include/deal.II/base/std_cxx17/tuple.h
+++ b/include/deal.II/base/std_cxx17/tuple.h
@@ -17,8 +17,10 @@
 
 #include <deal.II/base/config.h>
 
+#ifdef DEAL_II_EARLY_DEPRECATIONS
 DEAL_II_WARNING(
-  "This file is deprecated. Simply use the corresponding C++14 header <tuple>.")
+  "This file is deprecated. Simply use the corresponding C++17 header <tuple>.")
+#endif
 
 #include <tuple>
 

diff --git a/include/deal.II/base/std_cxx17/variant.h b/include/deal.II/base/std_cxx17/variant.h
index a7d42b74b9d650c801571746e1567a933f9200ba..a159ab1d2fa28eb90a43d30873a15c32ab3c3d82 100644 (file)
--- a/include/deal.II/base/std_cxx17/variant.h
+++ b/include/deal.II/base/std_cxx17/variant.h
@@ -17,8 +17,10 @@
 
 #include <deal.II/base/config.h>
 
+#ifdef DEAL_II_EARLY_DEPRECATIONS
 DEAL_II_WARNING(
-  "This file is deprecated. Simply use the corresponding C++14 header <variant>.")
+  "This file is deprecated. Simply use the corresponding C++17 header <variant>.")
+#endif
 
 #include <variant>