From: Timo Heister Date: Sun, 31 May 2020 21:27:02 +0000 (-0400) Subject: disable using c++ 20 iota-view and always use boost X-Git-Tag: v9.3.0-rc1~1510^2 X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F10432%2Fhead;p=dealii.git disable using c++ 20 iota-view and always use boost gcc-10 does not contain the ``iterator`` typedef, which makes the usage somewhat incompatible to what we want. For now, disable the c++20 support. see #10426 --- diff --git a/include/deal.II/base/std_cxx20/iota_view.h b/include/deal.II/base/std_cxx20/iota_view.h index c190efc302..d29695db92 100644 --- a/include/deal.II/base/std_cxx20/iota_view.h +++ b/include/deal.II/base/std_cxx20/iota_view.h @@ -17,11 +17,9 @@ #include -#ifdef DEAL_II_HAVE_CXX20 -# include -#else -# include -#endif +// For now we unconditionally use the boost implementation, even though gcc-10 +// has an implementation (which does not contain the iterator typedef): +#include DEAL_II_NAMESPACE_OPEN @@ -29,7 +27,6 @@ namespace std_cxx20 { namespace ranges { -#ifndef DEAL_II_HAVE_CXX20 /** * A poor-man's implementation of std::ranges::iota_view using * boost's integer_range class. The two classes are not completely @@ -44,9 +41,6 @@ namespace std_cxx20 */ template using iota_view = boost::integer_range; -#else - using std::ranges::iota_view; -#endif } // namespace ranges } // namespace std_cxx20