Skip to content

Commit

Permalink
Fix gsl/util for c++20 compilers without <span> (#993)
Browse files Browse the repository at this point in the history
For instance, clang 10 sets __cplusplus >= 202002L yet does not have span, which causes build errors:

https://gcc.godbolt.org/z/Yq345zGea
  • Loading branch information
jcelerier authored Sep 15, 2021
1 parent 8a4b9ed commit f09b249
Showing 1 changed file with 7 additions and 4 deletions.
11 changes: 7 additions & 4 deletions include/gsl/util
Original file line number Diff line number Diff line change
Expand Up @@ -25,9 +25,12 @@
#include <type_traits> // for is_signed, integral_constant
#include <utility> // for exchange, forward

#if defined(__cplusplus) && __cplusplus >= 202002L
#if defined(__has_include) && __has_include(<version>)
#include <version>
#if defined(__cpp_lib_span) && __cpp_lib_span >= 202002L
#include <span>
#endif // __cplusplus >= 202002L
#endif // __cpp_lib_span >= 202002L
#endif //__has_include(<version>)

#if defined(_MSC_VER) && !defined(__clang__)

Expand Down Expand Up @@ -138,14 +141,14 @@ GSL_SUPPRESS(bounds.1) // NO-FORMAT: attribute
return *(cont.begin() + i);
}

#if defined(__cplusplus) && __cplusplus >= 202002L
#if defined(__cpp_lib_span) && __cpp_lib_span >= 202002L
template <class T, size_t extent = std::dynamic_extent>
constexpr auto at(std::span<T, extent> sp, const index i)
{
Expects(i >= 0 && i < narrow_cast<i>(sp.size()));
return sp[i];
}
#endif // __cplusplus >= 202002L
#endif // __cpp_lib_span >= 202002L
} // namespace gsl

#if defined(_MSC_VER) && !defined(__clang__)
Expand Down

0 comments on commit f09b249

Please sign in to comment.