Update include/deal.II/base/config.h.in

diff --git a/include/deal.II/base/config.h.in b/include/deal.II/base/config.h.in
index b5da2f18561233ad0f302a08b91abd6b6913a435..6218b7bbd78ecc541d169f866ae5117637712552 100644 (file)
--- a/include/deal.II/base/config.h.in
+++ b/include/deal.II/base/config.h.in
@@ -187,13 +187,10 @@
 #cmakedefine DEAL_II_FALLTHROUGH @DEAL_II_FALLTHROUGH@
 #cmakedefine DEAL_II_CONSTEXPR @DEAL_II_CONSTEXPR@
 
-// The following two are defined for backwards compatibility with older deal.II versions:
+// The following three are defined for backwards compatibility with older deal.II versions:
 #define DEAL_II_WITH_CXX11
 #define DEAL_II_WITH_CXX14
-
-#ifdef DEAL_II_HAVE_CXX17
-#  define DEAL_II_WITH_CXX17
-#endif
+#define DEAL_II_WITH_CXX17
 
 
 /***********************************************************************

diff --git a/include/deal.II/base/std_cxx17/tuple.h b/include/deal.II/base/std_cxx17/tuple.h
index e81cce318b94e829dce80f9b24ad147c1d74ffbd..8e78e93b94cec5e432a6f2f0f2e4a6e6494f588d 100644 (file)
--- a/include/deal.II/base/std_cxx17/tuple.h
+++ b/include/deal.II/base/std_cxx17/tuple.h
@@ -25,32 +25,7 @@ DEAL_II_WARNING(
 DEAL_II_NAMESPACE_OPEN
 namespace std_cxx17
 {
-#ifndef DEAL_II_HAVE_CXX17
-  template <typename F, typename Tuple, size_t... S>
-  auto
-  apply_impl(F &&fn, Tuple &&t, std::index_sequence<S...>)
-    -> decltype(std::forward<F>(fn)(std::get<S>(std::forward<Tuple>(t))...))
-  {
-    return std::forward<F>(fn)(std::get<S>(std::forward<Tuple>(t))...);
-  }
-
-  template <typename F, typename Tuple>
-  auto
-  apply(F &&fn, Tuple &&t) -> decltype(apply_impl(
-    std::forward<F>(fn),
-    std::forward<Tuple>(t),
-    std::make_index_sequence<
-      std::tuple_size<typename std::remove_reference<Tuple>::type>::value>()))
-  {
-    std::size_t constexpr tSize =
-      std::tuple_size<typename std::remove_reference<Tuple>::type>::value;
-    return apply_impl(std::forward<F>(fn),
-                      std::forward<Tuple>(t),
-                      std::make_index_sequence<tSize>());
-  }
-#else
   using std::apply;
-#endif
 } // namespace std_cxx17
 DEAL_II_NAMESPACE_CLOSE