From b9d4c6832de29508491594423ff3d2d7549d3d4b Mon Sep 17 00:00:00 2001 From: Daniel Arndt Date: Sat, 1 Jul 2023 14:55:19 -0400 Subject: [PATCH] Update include/deal.II/base/config.h.in --- include/deal.II/base/config.h.in | 7 ++----- include/deal.II/base/std_cxx17/tuple.h | 25 ------------------------- 2 files changed, 2 insertions(+), 30 deletions(-) diff --git a/include/deal.II/base/config.h.in b/include/deal.II/base/config.h.in index b5da2f1856..6218b7bbd7 100644 --- 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 e81cce318b..8e78e93b94 100644 --- 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 - auto - apply_impl(F &&fn, Tuple &&t, std::index_sequence) - -> decltype(std::forward(fn)(std::get(std::forward(t))...)) - { - return std::forward(fn)(std::get(std::forward(t))...); - } - - template - auto - apply(F &&fn, Tuple &&t) -> decltype(apply_impl( - std::forward(fn), - std::forward(t), - std::make_index_sequence< - std::tuple_size::type>::value>())) - { - std::size_t constexpr tSize = - std::tuple_size::type>::value; - return apply_impl(std::forward(fn), - std::forward(t), - std::make_index_sequence()); - } -#else using std::apply; -#endif } // namespace std_cxx17 DEAL_II_NAMESPACE_CLOSE -- 2.39.5