diff options
| author | Jordan Maples [MSFT] <49793787+JordanMaples@users.noreply.github.com> | 2020-02-26 01:09:29 +0300 |
|---|---|---|
| committer | Jordan Maples [MSFT] <49793787+JordanMaples@users.noreply.github.com> | 2020-02-26 01:09:29 +0300 |
| commit | 4a6a7a095ddd748064b6036d9bb9e73a0bdc5e40 (patch) | |
| tree | aef269e6f6eb7ab329581e308531bd7728246fb5 /include | |
| parent | d2fdeda06eb91db96853d49faeb5b6a830fcc7d3 (diff) | |
add back array header, will remove in separate pr
Diffstat (limited to 'include')
| -rw-r--r-- | include/gsl/span | 19 |
1 files changed, 1 insertions, 18 deletions
diff --git a/include/gsl/span b/include/gsl/span index c13a7c8..23c58c9 100644 --- a/include/gsl/span +++ b/include/gsl/span @@ -21,28 +21,11 @@ #include <gsl/gsl_byte> // for byte #include <gsl/gsl_util> // for narrow_cast, narrow +#include <array> // for array #include <cstddef> // for ptrdiff_t, size_t, nullptr_t #include <iterator> // for reverse_iterator, distance, random_access_... #include <type_traits> // for enable_if_t, declval, is_convertible, inte... -// forward declaring std::array. -// pulling the entire array header is unnecessary for span because array is only used for a few constructors. -// The end user's logic will pull in the actual definition of array if they need it. -// To do: find a way to forward declare array for Apple Clang -#if defined(__APPLE__) -#include <array> -#else -namespace std -{ -template <class Type, std::size_t Sz> -#if defined(__clang__) -struct array; -#else -class array; -#endif // defined(__clang__) -} -#endif // defined(__APPLE__) - #if defined(_MSC_VER) && !defined(__clang__) #pragma warning(push) |