diff --git a/dumux/common/typetraits/typetraits.hh b/dumux/common/typetraits/typetraits.hh index ebc9d1cdcdf582ed8d4879e59de34952a9de801a..b73817186174a9bb268dbb47b92400740382e625 100644 --- a/dumux/common/typetraits/typetraits.hh +++ b/dumux/common/typetraits/typetraits.hh @@ -25,8 +25,6 @@ #include -#include - namespace Dumux { /*! * \brief Template which always yields a false value @@ -35,15 +33,5 @@ namespace Dumux { template struct AlwaysFalse : public std::false_type {}; - /*! \brief We define our own is_indexable type in order - * to avoid several version checks throughout dumux. - * This should be deleted when the deprecation phase is over. - * - * \deprecated Use Dune::IsIndexable instead. Will - * be removed after DuMux 3.4. - */ - template - using IsIndexable [[deprecated("Use Dune::IsIndexable instead. Will be removed after 3.4")]] = typename Dune::IsIndexable; - } // end namespace Dumux #endif diff --git a/dumux/io/vtk/intersectionwriter.hh b/dumux/io/vtk/intersectionwriter.hh index b944226578cf1459af605117de7514d68d55bd2e..f4e74a2f957871a541a6a4fef5b016435daaa0fd 100644 --- a/dumux/io/vtk/intersectionwriter.hh +++ b/dumux/io/vtk/intersectionwriter.hh @@ -23,11 +23,11 @@ #include #include +#include #include #include #include #include -#include namespace Dumux::Detail { @@ -179,9 +179,9 @@ public: { if constexpr (std::is_invocable_v) { - if constexpr (IsIndexable(), 0))>>{}) + if constexpr (Dune::IsIndexable(), 0))>>{}) { - if constexpr (IsIndexable(), 0)[0])>>{}) + if constexpr (Dune::IsIndexable(), 0)[0])>>{}) DUNE_THROW(Dune::InvalidStateException, "Invalid field type"); else { @@ -190,10 +190,10 @@ public: } } } - else if constexpr (IsIndexable>{}) + else if constexpr (Dune::IsIndexable>{}) { assert(field.size() == gv.size(1)); - if constexpr (IsIndexable>{}) + if constexpr (Dune::IsIndexable>{}) DUNE_THROW(Dune::InvalidStateException, "Invalid field type"); else components_ = field[0].size(); @@ -215,14 +215,14 @@ public: { if constexpr (std::is_invocable_v) { - if constexpr (IsIndexable>{}) + if constexpr (Dune::IsIndexable>{}) return field_(intersection, idx)[i]; else return field_(intersection, idx); } else { - if constexpr (IsIndexable()[0])>>{}) + if constexpr (Dune::IsIndexable()[0])>>{}) return field_[idx][i]; else return field_[idx];