remove multi_span (#958)

6 files changed, 0 insertions, 5141 deletions

diff --git a/include/gsl/gsl b/include/gsl/gsl
index ac5e144..adadc40 100644
--- a/include/gsl/gsl
+++ b/include/gsl/gsl
@@ -21,7 +21,6 @@
 #include <gsl/assert>      // Ensures/Expects
 #include <gsl/byte>        // byte
 #include <gsl/pointers>    // owner, not_null
-#include <gsl/multi_span>  // multi_span, strided_span...
 #include <gsl/span>        // span
 #include <gsl/string_span> // zstring, string_span, zstring_builder...
 #include <gsl/util>        // finally()/narrow_cast()...
diff --git a/include/gsl/multi_span b/include/gsl/multi_span
deleted file mode 100644
index 14b86b3..0000000
--- a/include/gsl/multi_span
+++ /dev/null
@@ -1,2379 +0,0 @@
-///////////////////////////////////////////////////////////////////////////////
-//
-// Copyright (c) 2015 Microsoft Corporation. All rights reserved.
-//
-// This code is licensed under the MIT License (MIT).
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-//
-///////////////////////////////////////////////////////////////////////////////
-
-#ifndef GSL_MULTI_SPAN_H
-#define GSL_MULTI_SPAN_H
-
-#include <gsl/assert> // for Expects
-#include <gsl/byte>   // for byte
-#include <gsl/util>   // for narrow_cast
-
-#include <algorithm>        // for transform, lexicographical_compare
-#include <array>            // for array
-#include <cstddef>          // for std::ptrdiff_t, size_t, nullptr_t
-#include <cstdint>          // for PTRDIFF_MAX
-#include <functional>       // for divides, multiplies, minus, negate, plus
-#include <initializer_list> // for initializer_list
-#include <iterator>         // for iterator, random_access_iterator_tag
-#include <limits>           // for numeric_limits
-#include <new>
-#include <numeric>
-#include <stdexcept>
-#include <string>      // for basic_string
-#include <type_traits> // for enable_if_t, remove_cv_t, is_same, is_co...
-#include <utility>
-
-#if defined(_MSC_VER) && !defined(__clang__)
-
-// turn off some warnings that are noisy about our Expects statements
-#pragma warning(push)
-#pragma warning(disable : 4127) // conditional expression is constant
-#pragma warning(disable : 4702) // unreachable code
-
-// Turn MSVC /analyze rules that generate too much noise. TODO: fix in the tool.
-#pragma warning(disable : 26495) // uninitalized member when constructor calls constructor
-#pragma warning(disable : 26473) // in some instantiations we cast to the same type
-#pragma warning(disable : 26490) // TODO: bug in parser - attributes and templates
-#pragma warning(disable : 26465) // TODO: bug - suppression does not work on template functions
-#pragma warning(disable : 4996)  // use of function or classes marked [[deprecated]]
-
-#endif // _MSC_VER
-
-#if defined(__GNUC__) || defined(__clang__)
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
-#endif
-
-// GCC 7 does not like the signed unsigned missmatch (size_t std::ptrdiff_t)
-// While there is a conversion from signed to unsigned, it happens at
-// compiletime, so the compiler wouldn't have to warn indiscriminently, but
-// could check if the source value actually doesn't fit into the target type
-// and only warn in those cases.
-#if defined(__GNUC__) && __GNUC__ > 6
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wsign-conversion"
-#endif
-
-namespace gsl
-{
-
-/*
-** begin definitions of index and bounds
-*/
-namespace details
-{
-    template <typename SizeType>
-    struct [[deprecated]] SizeTypeTraits
-    {
-        static const SizeType max_value = std::numeric_limits<SizeType>::max();
-    };
-
-    template <typename... Ts>
-    class [[deprecated]] are_integral : public std::integral_constant<bool, true>
-    {
-    };
-
-    template <typename T, typename... Ts>
-    class [[deprecated]] are_integral<T, Ts...>
-        : public std::integral_constant<bool,
-                                        std::is_integral<T>::value && are_integral<Ts...>::value>
-    {
-    };
-} // namespace details
-
-template <std::size_t Rank>
-class [[deprecated]] multi_span_index final
-{
-    static_assert(Rank > 0, "Rank must be greater than 0!");
-
-    template <std::size_t OtherRank>
-    friend class multi_span_index;
-
-public:
-    static const std::size_t rank = Rank;
-    using value_type = std::ptrdiff_t;
-    using size_type = value_type;
-    using reference = std::add_lvalue_reference_t<value_type>;
-    using const_reference = std::add_lvalue_reference_t<std::add_const_t<value_type>>;
-
-    constexpr multi_span_index() noexcept {}
-
-    constexpr multi_span_index(const value_type (&values)[Rank]) noexcept
-    {
-        // clang-format off
-        GSL_SUPPRESS(bounds.1) // NO-FORMAT: attribute
-        GSL_SUPPRESS(bounds.3) // NO-FORMAT: attribute
-        // clang-format on
-        std::copy(values, values + Rank, elems);
-    }
-
-    template <typename... Ts, typename = std::enable_if_t<(sizeof...(Ts) == Rank) &&
-                                                          details::are_integral<Ts...>::value>>
-    constexpr multi_span_index(Ts... ds) noexcept : elems{narrow_cast<value_type>(ds)...}
-    {}
-
-    constexpr multi_span_index(const multi_span_index& other) noexcept = default;
-
-    constexpr multi_span_index& operator=(const multi_span_index& rhs) noexcept = default;
-
-    // Preconditions: component_idx < rank
-    // clang-format off
-    GSL_SUPPRESS(bounds.2) // NO-FORMAT: attribute
-    GSL_SUPPRESS(bounds.4) // NO-FORMAT: attribute
-    // clang-format on
-    constexpr reference operator[](std::size_t component_idx)
-    {
-        Expects(component_idx < Rank); // Component index must be less than rank
-        return elems[component_idx];
-    }
-
-    // Preconditions: component_idx < rank
-    // clang-format off
-    GSL_SUPPRESS(bounds.2) // NO-FORMAT: attribute
-    GSL_SUPPRESS(bounds.4) // NO-FORMAT: attribute
-    // clang-format on
-    constexpr const_reference operator[](std::size_t component_idx) const
-    {
-        Expects(component_idx < Rank); // Component index must be less than rank
-        return elems[component_idx];
-    }
-
-    // clang-format off
-    GSL_SUPPRESS(bounds.1) // NO-FORMAT: attribute
-    GSL_SUPPRESS(bounds.3) // NO-FORMAT: attribute
-    // clang-format on
-    constexpr bool operator==(const multi_span_index& rhs) const
-    {
-        return std::equal(elems, elems + rank, rhs.elems);
-    }
-
-    constexpr bool operator!=(const multi_span_index& rhs) const { return !(*this == rhs); }
-
-    constexpr multi_span_index operator+() const noexcept { return *this; }
-
-    constexpr multi_span_index operator-() const
-    {
-        multi_span_index ret = *this;
-        std::transform(ret, ret + rank, ret, std::negate<value_type>{});
-        return ret;
-    }
-
-    constexpr multi_span_index operator+(const multi_span_index& rhs) const
-    {
-        multi_span_index ret = *this;
-        ret += rhs;
-        return ret;
-    }
-
-    constexpr multi_span_index operator-(const multi_span_index& rhs) const
-    {
-        multi_span_index ret = *this;
-        ret -= rhs;
-        return ret;
-    }
-
-    constexpr multi_span_index& operator+=(const multi_span_index& rhs)
-    {
-        // clang-format off
-        GSL_SUPPRESS(bounds.1) // NO-FORMAT: attribute
-        GSL_SUPPRESS(bounds.3) // NO-FORMAT: attribute
-        // clang-format on
-        std::transform(elems, elems + rank, rhs.elems, elems, std::plus<value_type>{});
-        return *this;
-    }
-
-    constexpr multi_span_index& operator-=(const multi_span_index& rhs)
-    {
-        // clang-format off
-        GSL_SUPPRESS(bounds.1) // NO-FORMAT: attribute
-        GSL_SUPPRESS(bounds.3) // NO-FORMAT: attribute
-        // clang-format on
-        std::transform(elems, elems + rank, rhs.elems, elems, std::minus<value_type>{});
-        return *this;
-    }
-
-    constexpr multi_span_index operator*(value_type v) const
-    {
-        multi_span_index ret = *this;
-        ret *= v;
-        return ret;
-    }
-
-    constexpr multi_span_index operator/(value_type v) const
-    {
-        multi_span_index ret = *this;
-        ret /= v;
-        return ret;
-    }
-
-    friend constexpr multi_span_index operator*(value_type v, const multi_span_index& rhs)
-    {
-        return rhs * v;
-    }
-
-    constexpr multi_span_index& operator*=(value_type v)
-    {
-        // clang-format off
-        GSL_SUPPRESS(bounds.1) // NO-FORMAT: attribute
-        GSL_SUPPRESS(bounds.3) // NO-FORMAT: attribute
-        // clang-format on
-        std::transform(elems, elems + rank, elems,
-                       [v](value_type x) { return std::multiplies<value_type>{}(x, v); });
-        return *this;
-    }
-
-    constexpr multi_span_index& operator/=(value_type v)
-    {
-        // clang-format off
-        GSL_SUPPRESS(bounds.1) // NO-FORMAT: attribute
-        GSL_SUPPRESS(bounds.3) // NO-FORMAT: attribute
-        // clang-format on
-        std::transform(elems, elems + rank, elems,
-                       [v](value_type x) { return std::divides<value_type>{}(x, v); });
-        return *this;
-    }
-
-private:
-    value_type elems[Rank] = {};
-};
-
-#if !defined(_MSC_VER) || _MSC_VER >= 1910
-
-struct [[deprecated]] static_bounds_dynamic_range_t
-{
-    template <typename T, typename = std::enable_if_t<std::is_integral<T>::value>>
-    constexpr operator T() const noexcept
-    {
-        return narrow_cast<T>(-1);
-    }
-};
-
-constexpr bool operator==(static_bounds_dynamic_range_t, static_bounds_dynamic_range_t) noexcept
-{
-    return true;
-}
-
-constexpr bool operator!=(static_bounds_dynamic_range_t, static_bounds_dynamic_range_t) noexcept
-{
-    return false;
-}
-
-template <typename T, typename = std::enable_if_t<std::is_integral<T>::value>>
-constexpr bool operator==(static_bounds_dynamic_range_t, T other) noexcept
-{
-    return narrow_cast<T>(-1) == other;
-}
-
-template <typename T, typename = std::enable_if_t<std::is_integral<T>::value>>
-constexpr bool operator==(T left, static_bounds_dynamic_range_t right) noexcept
-{
-    return right == left;
-}
-
-template <typename T, typename = std::enable_if_t<std::is_integral<T>::value>>
-constexpr bool operator!=(static_bounds_dynamic_range_t, T other) noexcept
-{
-    return narrow_cast<T>(-1) != other;
-}
-
-template <typename T, typename = std::enable_if_t<std::is_integral<T>::value>>
-constexpr bool operator!=(T left, static_bounds_dynamic_range_t right) noexcept
-{
-    return right != left;
-}
-
-constexpr static_bounds_dynamic_range_t dynamic_range{};
-#else
-const std::ptrdiff_t dynamic_range = -1;
-#endif
-
-struct [[deprecated]] generalized_mapping_tag
-{
-};
-struct [[deprecated]] contiguous_mapping_tag : generalized_mapping_tag
-{
-};
-
-namespace details
-{
-
-    template <std::ptrdiff_t Left, std::ptrdiff_t Right>
-    struct [[deprecated]] LessThan
-    {
-        static const bool value = Left < Right;
-    };
-
-    template <std::ptrdiff_t... Ranges>
-    struct [[deprecated]] BoundsRanges
-    {
-        using size_type = std::ptrdiff_t;
-        static const size_type Depth = 0;
-        static const size_type DynamicNum = 0;
-        static const size_type CurrentRange = 1;
-        static const size_type TotalSize = 1;
-
-        // TODO : following signature is for work around VS bug
-        template <typename OtherRange>
-        constexpr BoundsRanges(const OtherRange&, bool /* firstLevel */)
-        {}
-
-        constexpr BoundsRanges(const std::ptrdiff_t* const) {}
-        constexpr BoundsRanges() noexcept = default;
-
-        template <typename T, std::size_t Dim>
-        constexpr void serialize(T&) const
-        {}
-
-        template <typename T, std::size_t Dim>
-        constexpr size_type linearize(const T&) const
-        {
-            return 0;
-        }
-
-        template <typename T, std::size_t Dim>
-        constexpr size_type contains(const T&) const
-        {
-            return -1;
-        }
-
-        constexpr size_type elementNum(std::size_t) const noexcept { return 0; }
-
-        constexpr size_type totalSize() const noexcept { return TotalSize; }
-
-        constexpr bool operator==(const BoundsRanges&) const noexcept { return true; }
-    };
-
-    template <std::ptrdiff_t... RestRanges>
-    struct [[deprecated]] BoundsRanges<dynamic_range, RestRanges...> : BoundsRanges<RestRanges...>
-    {
-        using Base = BoundsRanges<RestRanges...>;
-        using size_type = std::ptrdiff_t;
-        static const std::size_t Depth = Base::Depth + 1;
-        static const std::size_t DynamicNum = Base::DynamicNum + 1;
-        static const size_type CurrentRange = dynamic_range;
-        static const size_type TotalSize = dynamic_range;
-
-    private:
-        size_type m_bound;
-
-    public:
-        // clang-format off
-        GSL_SUPPRESS(f.23)      // NO-FORMAT: attribute // this pointer type is cannot be assigned nullptr - issue in not_null
-        GSL_SUPPRESS(bounds.1)  // NO-FORMAT: attribute
-        // clang-format on
-        constexpr BoundsRanges(const std::ptrdiff_t* const arr)
-            : Base(arr + 1), m_bound(*arr * this->Base::totalSize())
-        {
-            Expects(0 <= *arr);
-        }
-
-        constexpr BoundsRanges() noexcept : m_bound(0) {}
-
-        template <std::ptrdiff_t OtherRange, std::ptrdiff_t... RestOtherRanges>
-        constexpr BoundsRanges(const BoundsRanges<OtherRange, RestOtherRanges...>& other,
-                               bool /* firstLevel */ = true)
-            : Base(static_cast<const BoundsRanges<RestOtherRanges...>&>(other), false)
-            , m_bound(other.totalSize())
-        {}
-
-        template <typename T, std::size_t Dim = 0>
-        constexpr void serialize(T& arr) const
-        {
-            arr[Dim] = elementNum();
-            this->Base::template serialize<T, Dim + 1>(arr);
-        }
-
-        template <typename T, std::size_t Dim = 0>
-        // clang-format off
-        GSL_SUPPRESS(bounds.4) // NO-FORMAT: attribute
-        // clang-format on
-        constexpr size_type linearize(const T& arr) const
-        {
-            const size_type index = this->Base::totalSize() * arr[Dim];
-            Expects(index < m_bound);
-            return index + this->Base::template linearize<T, Dim + 1>(arr);
-        }
-
-        template <typename T, std::size_t Dim = 0>
-        constexpr size_type contains(const T& arr) const
-        {
-            const std::ptrdiff_t last = this->Base::template contains<T, Dim + 1>(arr);
-            if (last == -1) return -1;
-            const std::ptrdiff_t cur = this->Base::totalSize() * arr[Dim];
-            return cur < m_bound ? cur + last : -1;
-        }
-
-        // clang-format off
-        GSL_SUPPRESS(c.128) // NO-FORMAT: attribute // no pointers to BoundsRanges should be ever used
-        // clang-format on
-        constexpr size_type totalSize() const noexcept { return m_bound; }
-
-        // clang-format off
-        GSL_SUPPRESS(c.128) // NO-FORMAT: attribute // no pointers to BoundsRanges should be ever used
-        // clang-format on
-        constexpr size_type elementNum() const noexcept
-        {
-            return totalSize() / this->Base::totalSize();
-        }
-
-        // clang-format off
-        GSL_SUPPRESS(c.128) // NO-FORMAT: attribute // no pointers to BoundsRanges should be ever used
-        // clang-format on
-        constexpr size_type elementNum(std::size_t dim) const noexcept
-        {
-            if (dim > 0)
-                return this->Base::elementNum(dim - 1);
-            else
-                return elementNum();
-        }
-
-        constexpr bool operator==(const BoundsRanges& rhs) const noexcept
-        {
-            return m_bound == rhs.m_bound &&
-                   static_cast<const Base&>(*this) == static_cast<const Base&>(rhs);
-        }
-    };
-
-    template <std::ptrdiff_t CurRange, std::ptrdiff_t... RestRanges>
-    struct [[deprecated]] BoundsRanges<CurRange, RestRanges...> : BoundsRanges<RestRanges...>
-    {
-        using Base = BoundsRanges<RestRanges...>;
-        using size_type = std::ptrdiff_t;
-        static const std::size_t Depth = Base::Depth + 1;
-        static const std::size_t DynamicNum = Base::DynamicNum;
-        static const size_type CurrentRange = CurRange;
-        static const size_type TotalSize =
-            Base::TotalSize == dynamic_range ? dynamic_range : CurrentRange * Base::TotalSize;
-
-        constexpr BoundsRanges(const std::ptrdiff_t* const arr) : Base(arr) {}
-        constexpr BoundsRanges() = default;
-
-        template <std::ptrdiff_t OtherRange, std::ptrdiff_t... RestOtherRanges>
-        constexpr BoundsRanges(const BoundsRanges<OtherRange, RestOtherRanges...>& other,
-                               bool firstLevel = true)
-            : Base(static_cast<const BoundsRanges<RestOtherRanges...>&>(other), false)
-        {
-            // clang-format off
-            GSL_SUPPRESS(type.4) // NO-FORMAT: attribute // TODO: false positive
-            // clang-format on
-            (void) firstLevel;
-        }
-
-        template <typename T, std::size_t Dim = 0>
-        constexpr void serialize(T& arr) const
-        {
-            arr[Dim] = elementNum();
-            this->Base::template serialize<T, Dim + 1>(arr);
-        }
-
-        template <typename T, std::size_t Dim = 0>
-        constexpr size_type linearize(const T& arr) const
-        {
-            // clang-format off
-            GSL_SUPPRESS(bounds.4)                            // NO-FORMAT: attribute
-            // clang-format on
-            Expects(arr[Dim] >= 0 && arr[Dim] < CurrentRange); // Index is out of range
-            // clang-format off
-            GSL_SUPPRESS(bounds.4)                            // NO-FORMAT: attribute
-            // clang-format on
-            const std::ptrdiff_t d = arr[Dim];
-            return this->Base::totalSize() * d + this->Base::template linearize<T, Dim + 1>(arr);
-        }
-
-        template <typename T, std::size_t Dim = 0>
-        constexpr size_type contains(const T& arr) const
-        {
-            if (arr[Dim] >= CurrentRange) return -1;
-            const size_type last = this->Base::template contains<T, Dim + 1>(arr);
-            if (last == -1) return -1;
-            return this->Base::totalSize() * arr[Dim] + last;
-        }
-
-        // clang-format off
-        GSL_SUPPRESS(c.128) // NO-FORMAT: attribute // no pointers to BoundsRanges should be ever used
-        // clang-format on
-        constexpr size_type totalSize() const noexcept
-        {
-            return CurrentRange * this->Base::totalSize();
-        }
-
-        // clang-format off
-        GSL_SUPPRESS(c.128) // NO-FORMAT: attribute // no pointers to BoundsRanges should be ever used
-        // clang-format on
-        constexpr size_type elementNum() const noexcept { return CurrentRange; }
-
-        // clang-format off
-        GSL_SUPPRESS(c.128) // NO-FORMAT: attribute // no pointers to BoundsRanges should be ever used
-        // clang-format on
-        constexpr size_type elementNum(std::size_t dim) const noexcept
-        {
-            if (dim > 0)
-                return this->Base::elementNum(dim - 1);
-            else
-                return elementNum();
-        }
-
-        constexpr bool operator==(const BoundsRanges& rhs) const noexcept
-        {
-            return static_cast<const Base&>(*this) == static_cast<const Base&>(rhs);
-        }
-    };
-
-    template <typename SourceType, typename TargetType>
-    struct [[deprecated]] BoundsRangeConvertible
-        : public std::integral_constant<bool, (SourceType::TotalSize >= TargetType::TotalSize ||
-                                               TargetType::TotalSize == dynamic_range ||
-                                               SourceType::TotalSize == dynamic_range ||
-                                               TargetType::TotalSize == 0)>
-    {
-    };
-
-    template <typename TypeChain>
-    struct [[deprecated]] TypeListIndexer
-    {
-        const TypeChain& obj_;
-        constexpr TypeListIndexer(const TypeChain& obj) : obj_(obj) {}
-
-        template <std::size_t N>
-        constexpr const TypeChain& getObj(std::true_type)
-        {
-            return obj_;
-        }
-
-        template <std::size_t N, typename MyChain = TypeChain,
-                  typename MyBase = typename MyChain::Base>
-        constexpr auto getObj(std::false_type)
-            -> decltype(TypeListIndexer<MyBase>(static_cast<const MyBase&>(obj_)).template get<N>())
-        {
-            return TypeListIndexer<MyBase>(static_cast<const MyBase&>(obj_)).template get<N>();
-        }
-
-        template <std::size_t N>
-        constexpr auto get() -> decltype(getObj<N - 1>(std::integral_constant<bool, N == 0>()))
-        {
-            return getObj<N - 1>(std::integral_constant<bool, N == 0>());
-        }
-    };
-
-    template <typename TypeChain>
-    constexpr TypeListIndexer<TypeChain> createTypeListIndexer(const TypeChain& obj)
-    {
-        return TypeListIndexer<TypeChain>(obj);
-    }
-
-    template <std::size_t Rank, bool Enabled = (Rank > 1),
-              typename Ret = std::enable_if_t<Enabled, multi_span_index<Rank - 1>>>
-    constexpr Ret shift_left(const multi_span_index<Rank>& other) noexcept
-    {
-        Ret ret{};
-        for (std::size_t i = 0; i < Rank - 1; ++i)
-        {
-            // clang-format off
-            GSL_SUPPRESS(bounds.4) // NO-FORMAT: attribute
-            // clang-format on
-            ret[i] = other[i + 1];
-        }
-        return ret;
-    }
-} // namespace details
-
-template <typename IndexType>
-class [[deprecated]] bounds_iterator;
-
-template <std::ptrdiff_t... Ranges>
-class [[deprecated]] static_bounds
-{
-public:
-    static_bounds(const details::BoundsRanges<Ranges...>&) {}
-};
-
-template <std::ptrdiff_t FirstRange, std::ptrdiff_t... RestRanges>
-class [[deprecated]] static_bounds<FirstRange, RestRanges...>
-{
-    using MyRanges = details::BoundsRanges<FirstRange, RestRanges...>;
-
-    MyRanges m_ranges;
-    constexpr static_bounds(const MyRanges& range) noexcept : m_ranges(range) {}
-
-    template <std::ptrdiff_t... OtherRanges>
-    friend class static_bounds;
-
-public:
-    static const std::size_t rank = MyRanges::Depth;
-    static const std::size_t dynamic_rank = MyRanges::DynamicNum;
-    static const std::ptrdiff_t static_size = MyRanges::TotalSize;
-
-    using size_type = std::ptrdiff_t;
-    using index_type = multi_span_index<rank>;
-    using const_index_type = std::add_const_t<index_type>;
-    using iterator = bounds_iterator<const_index_type>;
-    using const_iterator = bounds_iterator<const_index_type>;
-    using difference_type = std::ptrdiff_t;
-    using sliced_type = static_bounds<RestRanges...>;
-    using mapping_type = contiguous_mapping_tag;
-
-    constexpr static_bounds() /*noexcept*/ = default;
-
-    template <typename SourceType, typename TargetType, std::size_t Rank>
-    struct BoundsRangeConvertible2;
-
-    template <std::size_t Rank, typename SourceType, typename TargetType,
-              typename Ret = BoundsRangeConvertible2<typename SourceType::Base,
-                                                     typename TargetType::Base, Rank>>
-    static auto helpBoundsRangeConvertible(SourceType, TargetType, std::true_type) -> Ret;
-
-    template <std::size_t Rank, typename SourceType, typename TargetType>
-    static auto helpBoundsRangeConvertible(SourceType, TargetType, ...) -> std::false_type;
-
-    template <typename SourceType, typename TargetType, std::size_t Rank>
-    struct BoundsRangeConvertible2
-        : decltype(helpBoundsRangeConvertible<Rank - 1>(
-              SourceType(), TargetType(),
-              std::integral_constant<bool,
-                                     SourceType::Depth == TargetType::Depth &&
-                                         (SourceType::CurrentRange == TargetType::CurrentRange ||
-                                          TargetType::CurrentRange == dynamic_range ||
-                                          SourceType::CurrentRange == dynamic_range)>()))
-    {
-    };
-
-    template <typename SourceType, typename TargetType>
-    struct BoundsRangeConvertible2<SourceType, TargetType, 0> : std::true_type
-    {
-    };
-
-    template <typename SourceType, typename TargetType, std::ptrdiff_t Rank = TargetType::Depth>
-    struct BoundsRangeConvertible
-        : decltype(helpBoundsRangeConvertible<Rank - 1>(
-              SourceType(), TargetType(),
-              std::integral_constant<bool,
-                                     SourceType::Depth == TargetType::Depth &&
-                                         (!details::LessThan<SourceType::CurrentRange,
-                                                             TargetType::CurrentRange>::value ||
-                                          TargetType::CurrentRange == dynamic_range ||
-                                          SourceType::CurrentRange == dynamic_range)>()))
-    {
-    };
-
-    template <typename SourceType, typename TargetType>
-    struct BoundsRangeConvertible<SourceType, TargetType, 0> : std::true_type
-    {
-    };
-
-    template <std::ptrdiff_t... Ranges,
-              typename = std::enable_if_t<details::BoundsRangeConvertible<
-                  details::BoundsRanges<Ranges...>,
-                  details::BoundsRanges<FirstRange, RestRanges...>>::value>>
-    constexpr static_bounds(const static_bounds<Ranges...>& other) : m_ranges(other.m_ranges)
-    {
-        Expects((MyRanges::DynamicNum == 0 && details::BoundsRanges<Ranges...>::DynamicNum == 0) ||
-                MyRanges::DynamicNum > 0 || other.m_ranges.totalSize() >= m_ranges.totalSize());
-    }
-
-    constexpr static_bounds(std::initializer_list<size_type> il) : m_ranges(il.begin())
-    {
-        // Size of the initializer list must match the rank of the array
-        Expects((MyRanges::DynamicNum == 0 && il.size() == 1 && *il.begin() == static_size) ||
-                MyRanges::DynamicNum == il.size());
-        // Size of the range must be less than the max element of the size type
-        Expects(m_ranges.totalSize() <= PTRDIFF_MAX);
-    }
-
-    constexpr sliced_type slice() const noexcept
-    {
-        return sliced_type{static_cast<const details::BoundsRanges<RestRanges...>&>(m_ranges)};
-    }
-
-    constexpr size_type stride() const noexcept { return rank > 1 ? slice().size() : 1; }
-
-    constexpr size_type size() const noexcept { return m_ranges.totalSize(); }
-
-    constexpr size_type total_size() const noexcept { return m_ranges.totalSize(); }
-
-    constexpr size_type linearize(const index_type& idx) const { return m_ranges.linearize(idx); }
-
-    constexpr bool contains(const index_type& idx) const noexcept
-    {
-        return m_ranges.contains(idx) != -1;
-    }
-
-    constexpr size_type operator[](std::size_t idx) const noexcept
-    {
-        return m_ranges.elementNum(idx);
-    }
-
-    template <std::size_t Dim = 0>
-    constexpr size_type extent() const noexcept
-    {
-        static_assert(Dim < rank,
-                      "dimension should be less than rank (dimension count starts from 0)");
-        return details::createTypeListIndexer(m_ranges).template get<Dim>().elementNum();
-    }
-
-    template <typename IntType>
-    constexpr size_type extent(IntType dim) const
-    {
-        static_assert(std::is_integral<IntType>::value,
-                      "Dimension parameter must be supplied as an integral type.");
-        auto real_dim = narrow_cast<std::size_t>(dim);
-        Expects(real_dim < rank);
-
-        return m_ranges.elementNum(real_dim);
-    }
-
-    constexpr index_type index_bounds() const noexcept
-    {
-        size_type extents[rank] = {};
-        m_ranges.serialize(extents);
-        return {extents};
-    }
-
-    template <std::ptrdiff_t... Ranges>
-    constexpr bool operator==(const static_bounds<Ranges...>& rhs) const noexcept
-    {
-        return this->size() == rhs.size();
-    }
-
-    template <std::ptrdiff_t... Ranges>
-    constexpr bool operator!=(const static_bounds<Ranges...>& rhs) const noexcept
-    {
-        return !(*this == rhs);
-    }
-
-    constexpr const_iterator begin() const noexcept { return const_iterator(*this, index_type{}); }
-
-    constexpr const_iterator end() const noexcept
-    {
-        return const_iterator(*this, this->index_bounds());
-    }
-};
-
-template <std::size_t Rank>
-class [[deprecated]] strided_bounds
-{
-    template <std::size_t OtherRank>
-    friend class strided_bounds;
-
-public:
-    static const std::size_t rank = Rank;
-    using value_type = std::ptrdiff_t;
-    using reference = std::add_lvalue_reference_t<value_type>;
-    using const_reference = std::add_const_t<reference>;
-    using size_type = value_type;
-    using difference_type = value_type;
-    using index_type = multi_span_index<rank>;
-    using const_index_type = std::add_const_t<index_type>;
-    using iterator = bounds_iterator<const_index_type>;
-    using const_iterator = bounds_iterator<const_index_type>;
-    static const value_type dynamic_rank = rank;
-    static const value_type static_size = dynamic_range;
-    using sliced_type = std::conditional_t<rank != 0, strided_bounds<rank - 1>, void>;
-    using mapping_type = generalized_mapping_tag;
-
-    constexpr strided_bounds(const strided_bounds&) noexcept = default;
-
-    constexpr strided_bounds& operator=(const strided_bounds&) noexcept = default;
-
-    constexpr strided_bounds(const value_type (&values)[rank], index_type strides)
-        : m_extents(values), m_strides(std::move(strides))
-    {}
-
-    constexpr strided_bounds(const index_type& extents, const index_type& strides) noexcept
-        : m_extents(extents), m_strides(strides)
-    {}
-
-    constexpr index_type strides() const noexcept { return m_strides; }
-
-    // clang-format off
-    GSL_SUPPRESS(bounds.4) // NO-FORMAT: attribute
-    // clang-format on
-    constexpr size_type total_size() const noexcept
-    {
-        size_type ret = 0;
-        for (std::size_t i = 0; i < rank; ++i) { ret += (m_extents[i] - 1) * m_strides[i]; }
-        return ret + 1;
-    }
-
-    // clang-format off
-    GSL_SUPPRESS(bounds.4) // NO-FORMAT: attribute
-    // clang-format on
-    constexpr size_type size() const noexcept
-    {
-        size_type ret = 1;
-        for (std::size_t i = 0; i < rank; ++i) { ret *= m_extents[i]; }
-        return ret;
-    }
-
-    constexpr bool contains(const index_type& idx) const noexcept
-    {
-        for (std::size_t i = 0; i < rank; ++i)
-        {
-            if (idx[i] < 0 || idx[i] >= m_extents[i]) return false;
-        }
-        return true;
-    }
-
-    // clang-format off
-    GSL_SUPPRESS(bounds.4) // NO-FORMAT: attribute
-    // clang-format on
-    constexpr size_type linearize(const index_type& idx) const
-    {
-        size_type ret = 0;
-        for (std::size_t i = 0; i < rank; i++)
-        {
-            Expects(idx[i] < m_extents[i]); // index is out of bounds of the array
-            ret += idx[i] * m_strides[i];
-        }
-        return ret;
-    }
-
-    // clang-format off
-    GSL_SUPPRESS(bounds.4) // NO-FORMAT: attribute
-    // clang-format on
-    constexpr size_type stride() const noexcept { return m_strides[0]; }
-
-    template <bool Enabled = (rank > 1), typename Ret = std::enable_if_t<Enabled, sliced_type>>
-    constexpr sliced_type slice() const
-    {
-        return {details::shift_left(m_extents), details::shift_left(m_strides)};
-    }
-
-    template <std::size_t Dim = 0>
-
-    // clang-format off
-    GSL_SUPPRESS(bounds.4) // NO-FORMAT: attribute
-    // clang-format on
-    constexpr size_type extent() const noexcept
-    {
-        static_assert(Dim < Rank,
-                      "dimension should be less than rank (dimension count starts from 0)");
-        return m_extents[Dim];
-    }
-
-    constexpr index_type index_bounds() const noexcept { return m_extents; }
-
-    constexpr const_iterator begin() const noexcept { return const_iterator{*this, index_type{}}; }
-
-    constexpr const_iterator end() const noexcept { return const_iterator{*this, index_bounds()}; }
-
-private:
-    index_type m_extents;
-    index_type m_strides;
-};
-
-template <typename T>
-struct [[deprecated]] is_bounds : std::integral_constant<bool, false>
-{
-};
-template <std::ptrdiff_t... Ranges>
-struct [[deprecated]] is_bounds<static_bounds<Ranges...>> : std::integral_constant<bool, true>
-{
-};
-template <std::size_t Rank>
-struct [[deprecated]] is_bounds<strided_bounds<Rank>> : std::integral_constant<bool, true>
-{
-};
-
-template <typename IndexType>
-class [[deprecated]] bounds_iterator
-{
-public:
-    static const std::size_t rank = IndexType::rank;
-    using iterator_category = std::random_access_iterator_tag;
-    using value_type = IndexType;
-    using difference_type = std::ptrdiff_t;
-    using pointer = value_type*;
-    using reference = value_type&;
-    using index_type = value_type;
-    using index_size_type = typename IndexType::value_type;
-    template <typename Bounds>
-    explicit bounds_iterator(const Bounds& bnd, value_type curr) noexcept
-        : boundary_(bnd.index_bounds()), curr_(std::move(curr))
-    {
-        static_assert(is_bounds<Bounds>::value, "Bounds type must be provided");
-    }
-
-    constexpr reference operator*() const noexcept { return curr_; }
-
-    constexpr pointer operator->() const noexcept { return &curr_; }
-
-    // clang-format off
-    GSL_SUPPRESS(bounds.4) // NO-FORMAT: attribute
-    GSL_SUPPRESS(bounds.2) // NO-FORMAT: attribute
-    // clang-format on
-    constexpr bounds_iterator& operator++() noexcept
-
-    {
-        for (std::size_t i = rank; i-- > 0;)
-        {
-            if (curr_[i] < boundary_[i] - 1)
-            {
-                curr_[i]++;
-                return *this;
-            }
-            curr_[i] = 0;
-        }
-        // If we're here we've wrapped over - set to past-the-end.
-        curr_ = boundary_;
-        return *this;
-    }
-
-    constexpr bounds_iterator operator++(int) noexcept
-    {
-        auto ret = *this;
-        ++(*this);
-        return ret;
-    }
-
-    // clang-format off
-    GSL_SUPPRESS(bounds.4) // NO-FORMAT: attribute
-    // clang-format on
-    constexpr bounds_iterator& operator--()
-    {
-        if (!less(curr_, boundary_))
-        {
-            // if at the past-the-end, set to last element
-            for (std::size_t i = 0; i < rank; ++i) { curr_[i] = boundary_[i] - 1; }
-            return *this;
-        }
-        for (std::size_t i = rank; i-- > 0;)
-        {
-            if (curr_[i] >= 1)
-            {
-                curr_[i]--;
-                return *this;
-            }
-            curr_[i] = boundary_[i] - 1;
-        }
-        // If we're here the preconditions were violated
-        // "pre: there exists s such that r == ++s"
-        Expects(false);
-        return *this;
-    }
-
-    constexpr bounds_iterator operator--(int) noexcept
-    {
-        auto ret = *this;
-        --(*this);
-        return ret;
-    }
-
-    constexpr bounds_iterator operator+(difference_type n) const noexcept
-    {
-        bounds_iterator ret{*this};
-        return ret += n;
-    }
-
-    // clang-format off
-    GSL_SUPPRESS(bounds.4) // NO-FORMAT: attribute
-    // clang-format on
-    constexpr bounds_iterator& operator+=(difference_type n)
-    {
-        auto linear_idx = linearize(curr_) + n;
-        std::remove_const_t<value_type> stride = 0;
-        stride[rank - 1] = 1;
-        for (std::size_t i = rank - 1; i-- > 0;) { stride[i] = stride[i + 1] * boundary_[i + 1]; }
-        for (std::size_t i = 0; i < rank; ++i)
-        {
-            curr_[i] = linear_idx / stride[i];
-            linear_idx = linear_idx % stride[i];
-        }
-        // index is out of bounds of the array
-        Expects(!less(curr_, index_type{}) && !less(boundary_, curr_));
-        return *this;
-    }
-
-    constexpr bounds_iterator operator-(difference_type n) const noexcept
-    {
-        bounds_iterator ret{*this};
-        return ret -= n;
-    }
-
-    constexpr bounds_iterator& operator-=(difference_type n) noexcept { return *this += -n; }
-
-    constexpr difference_type operator-(const bounds_iterator& rhs) const noexcept
-    {
-        return linearize(curr_) - linearize(rhs.curr_);
-    }
-
-    constexpr value_type operator[](difference_type n) const noexcept { return *(*this + n); }
-
-    constexpr bool operator==(const bounds_iterator& rhs) const noexcept
-    {
-        return curr_ == rhs.curr_;
-    }
-
-    constexpr bool operator!=(const bounds_iterator& rhs) const noexcept { return !(*this == rhs); }
-
-    constexpr bool operator<(const bounds_iterator& rhs) const noexcept
-    {
-        return less(curr_, rhs.curr_);
-    }
-
-    constexpr bool operator<=(const bounds_iterator& rhs) const noexcept { return !(rhs < *this); }
-
-    constexpr bool operator>(const bounds_iterator& rhs) const noexcept { return rhs < *this; }
-
-    constexpr bool operator>=(const bounds_iterator& rhs) const noexcept { return !(rhs > *this); }
-
-    void swap(bounds_iterator& rhs) noexcept
-    {
-        std::swap(boundary_, rhs.boundary_);
-        std::swap(curr_, rhs.curr_);
-    }
-
-private:
-    // clang-format off
-    GSL_SUPPRESS(bounds.4) // NO-FORMAT: attribute
-    // clang-format on
-    constexpr bool less(index_type& one, index_type& other) const noexcept
-    {
-        for (std::size_t i = 0; i < rank; ++i)
-        {
-            if (one[i] < other[i]) return true;
-        }
-        return false;
-    }
-
-    // clang-format off
-    GSL_SUPPRESS(bounds.4) // NO-FORMAT: attribute
-    // clang-format on
-    constexpr index_size_type linearize(const value_type& idx) const noexcept
-    {
-        // TODO: Smarter impl.
-        // Check if past-the-end
-        index_size_type multiplier = 1;
-        index_size_type res = 0;
-        if (!less(idx, boundary_))
-        {
-            res = 1;
-            for (std::size_t i = rank; i-- > 0;)
-            {
-                res += (idx[i] - 1) * multiplier;
-                multiplier *= boundary_[i];
-            }
-        }
-        else
-        {
-            for (std::size_t i = rank; i-- > 0;)
-            {
-                res += idx[i] * multiplier;
-                multiplier *= boundary_[i];
-            }
-        }
-        return res;
-    }
-
-    value_type boundary_;
-    std::remove_const_t<value_type> curr_;
-};
-
-template <typename IndexType>
-bounds_iterator<IndexType> operator+(typename bounds_iterator<IndexType>::difference_type n,
-                                     const bounds_iterator<IndexType>& rhs) noexcept
-{
-    return rhs + n;
-}
-
-namespace details
-{
-    template <typename Bounds>
-    constexpr std::enable_if_t<
-        std::is_same<typename Bounds::mapping_type, generalized_mapping_tag>::value,
-        typename Bounds::index_type>
-    make_stride(const Bounds& bnd) noexcept
-    {
-        return bnd.strides();
-    }
-
-    // Make a stride vector from bounds, assuming contiguous memory.
-    template <typename Bounds>
-    constexpr std::enable_if_t<
-        std::is_same<typename Bounds::mapping_type, contiguous_mapping_tag>::value,
-        typename Bounds::index_type>
-    make_stride(const Bounds& bnd) noexcept
-    {
-        auto extents = bnd.index_bounds();
-        typename Bounds::size_type stride[Bounds::rank] = {};
-
-        stride[Bounds::rank - 1] = 1;
-        for (std::size_t i = 1; i < Bounds::rank; ++i)
-        {
-            // clang-format off
-            GSL_SUPPRESS(bounds.4) // NO-FORMAT: attribute
-            GSL_SUPPRESS(bounds.2) // NO-FORMAT: attribute
-            // clang-format on
-            stride[Bounds::rank - i - 1] = stride[Bounds::rank - i] * extents[Bounds::rank - i];
-        }
-        return {stride};
-    }
-
-    template <typename BoundsSrc, typename BoundsDest>
-    void verifyBoundsReshape(const BoundsSrc& src, const BoundsDest& dest)
-    {
-        static_assert(is_bounds<BoundsSrc>::value && is_bounds<BoundsDest>::value,
-                      "The src type and dest type must be bounds");
-        static_assert(std::is_same<typename BoundsSrc::mapping_type, contiguous_mapping_tag>::value,
-                      "The source type must be a contiguous bounds");
-        static_assert(BoundsDest::static_size == dynamic_range ||
-                          BoundsSrc::static_size == dynamic_range ||
-                          BoundsDest::static_size == BoundsSrc::static_size,
-                      "The source bounds must have same size as dest bounds");
-        Expects(src.size() == dest.size());
-    }
-
-} // namespace details
-
-template <typename Span>
-class [[deprecated]] contiguous_span_iterator;
-template <typename Span>
-class [[deprecated]] general_span_iterator;
-
-template <std::ptrdiff_t DimSize = dynamic_range>
-struct [[deprecated]] dim_t
-{
-    static const std::ptrdiff_t value = DimSize;
-};
-template <>
-struct [[deprecated]] dim_t<dynamic_range>
-{
-    static const std::ptrdiff_t value = dynamic_range;
-    const std::ptrdiff_t dvalue;
-    constexpr dim_t(std::ptrdiff_t size) noexcept : dvalue(size) {}
-};
-
-template <std::ptrdiff_t N, class = std::enable_if_t<(N >= 0)>>
-constexpr dim_t<N> dim() noexcept
-{
-    return dim_t<N>();
-}
-
-template <std::ptrdiff_t N = dynamic_range, class = std::enable_if_t<N == dynamic_range>>
-constexpr dim_t<N> dim(std::ptrdiff_t n) noexcept
-{
-    return dim_t<>(n);
-}
-
-template <typename ValueType, std::ptrdiff_t FirstDimension = dynamic_range,
-          std::ptrdiff_t... RestDimensions>
-class [[deprecated(
-    "gsl::multi_span is deprecated because it is not in the C++ Core Guidelines")]] multi_span;
-
-template <typename ValueType, std::size_t Rank>
-class [[deprecated(
-    "gsl::strided_span is deprecated because it is not in the C++ Core Guidelines")]] strided_span;
-
-namespace details
-{
-    template <typename T, typename = std::true_type>
-    struct [[deprecated]] SpanTypeTraits
-    {
-        using value_type = T;
-        using size_type = std::size_t;
-    };
-
-    template <typename Traits>
-    struct [[deprecated]] SpanTypeTraits<
-        Traits, typename std::is_reference<typename Traits::span_traits&>::type>
-    {
-        using value_type = typename Traits::span_traits::value_type;
-        using size_type = typename Traits::span_traits::size_type;
-    };
-
-    template <typename T, std::ptrdiff_t... Ranks>
-    struct [[deprecated]] SpanArrayTraits
-    {
-        using type = multi_span<T, Ranks...>;
-        using value_type = T;
-        using bounds_type = static_bounds<Ranks...>;
-        using pointer = T*;
-        using reference = T&;
-    };
-    template <typename T, std::ptrdiff_t N, std::ptrdiff_t... Ranks>
-    struct [[deprecated]] SpanArrayTraits<T[N], Ranks...> : SpanArrayTraits<T, Ranks..., N>
-    {
-    };
-
-    template <typename BoundsType>
-    BoundsType newBoundsHelperImpl(std::ptrdiff_t totalSize, std::true_type) // dynamic size
-    {
-        Expects(totalSize >= 0 && totalSize <= PTRDIFF_MAX);
-        return BoundsType{totalSize};
-    }
-    template <typename BoundsType>
-    BoundsType newBoundsHelperImpl(std::ptrdiff_t totalSize, std::false_type) // static size
-    {
-        Expects(BoundsType::static_size <= totalSize);
-        return {};
-    }
-    template <typename BoundsType>
-    BoundsType newBoundsHelper(std::ptrdiff_t totalSize)
-    {
-        static_assert(BoundsType::dynamic_rank <= 1, "dynamic rank must less or equal to 1");
-        return newBoundsHelperImpl<BoundsType>(
-            totalSize, std::integral_constant<bool, BoundsType::dynamic_rank == 1>());
-    }
-
-    struct [[deprecated]] Sep
-    {
-    };
-
-    template <typename T, typename... Args>
-    T static_as_multi_span_helper(Sep, Args... args)
-    {
-        return T{narrow_cast<typename T::size_type>(args)...};
-    }
-    template <typename T, typename Arg, typename... Args>
-    std::enable_if_t<
-        !std::is_same<Arg, dim_t<dynamic_range>>::value && !std::is_same<Arg, Sep>::value, T>
-    static_as_multi_span_helper(Arg, Args... args)
-    {
-        return static_as_multi_span_helper<T>(args...);
-    }
-    template <typename T, typename... Args>
-    T static_as_multi_span_helper(dim_t<dynamic_range> val, Args... args)
-    {
-        return static_as_multi_span_helper<T>(args..., val.dvalue);
-    }
-
-    template <typename... Dimensions>
-    struct [[deprecated]] static_as_multi_span_static_bounds_helper
-    {
-        using type = static_bounds<(Dimensions::value)...>;
-    };
-
-    template <typename T>
-    struct [[deprecated]] is_multi_span_oracle : std::false_type
-    {
-    };
-
-    template <typename ValueType, std::ptrdiff_t FirstDimension, std::ptrdiff_t... RestDimensions>
-    struct [[deprecated]] is_multi_span_oracle<
-        multi_span<ValueType, FirstDimension, RestDimensions...>> : std::true_type
-    {
-    };
-
-    template <typename ValueType, std::ptrdiff_t Rank>
-    struct [[deprecated]] is_multi_span_oracle<strided_span<ValueType, Rank>> : std::true_type
-    {
-    };
-
-    template <typename T>
-    struct [[deprecated]] is_multi_span : is_multi_span_oracle<std::remove_cv_t<T>>
-    {
-    };
-} // namespace details
-
-template <typename ValueType, std::ptrdiff_t FirstDimension, std::ptrdiff_t... RestDimensions>
-class [[deprecated(
-    "gsl::multi_span is deprecated because it is not in the C++ Core Guidelines")]] multi_span
-{
-    // TODO do we still need this?
-    template <typename ValueType2, std::ptrdiff_t FirstDimension2,
-              std::ptrdiff_t... RestDimensions2>
-    friend class multi_span;
-
-public:
-    using bounds_type = static_bounds<FirstDimension, RestDimensions...>;
-    static const std::size_t Rank = bounds_type::rank;
-    using size_type = typename bounds_type::size_type;
-    using index_type = typename bounds_type::index_type;
-    using value_type = ValueType;
-    using const_value_type = std::add_const_t<value_type>;
-    using pointer = std::add_pointer_t<value_type>;
-    using reference = std::add_lvalue_reference_t<value_type>;
-    using iterator = contiguous_span_iterator<multi_span>;
-    using const_span = multi_span<const_value_type, FirstDimension, RestDimensions...>;
-    using const_iterator = contiguous_span_iterator<const_span>;
-    using reverse_iterator = std::reverse_iterator<iterator>;
-    using const_reverse_iterator = std::reverse_iterator<const_iterator>;
-    using sliced_type =
-        std::conditional_t<Rank == 1, value_type, multi_span<value_type, RestDimensions...>>;
-
-private:
-    pointer data_;
-    bounds_type bounds_;
-
-    friend iterator;
-    friend const_iterator;
-
-public:
-    // default constructor - same as constructing from nullptr_t
-    // clang-format off
-    GSL_SUPPRESS(type.6) // NO-FORMAT: attribute // TODO: false positive
-    // clang-format on
-    constexpr multi_span() noexcept : multi_span(nullptr, bounds_type{})
-    {
-        static_assert(bounds_type::dynamic_rank != 0 ||
-                          (bounds_type::dynamic_rank == 0 && bounds_type::static_size == 0),
-                      "Default construction of multi_span<T> only possible "
-                      "for dynamic or fixed, zero-length spans.");
-    }
-
-    // construct from nullptr - get an empty multi_span
-    // clang-format off
-    GSL_SUPPRESS(type.6) // NO-FORMAT: attribute // TODO: false positive
-    // clang-format on
-    constexpr multi_span(std::nullptr_t) noexcept : multi_span(nullptr, bounds_type{})
-    {
-        static_assert(bounds_type::dynamic_rank != 0 ||
-                          (bounds_type::dynamic_rank == 0 && bounds_type::static_size == 0),
-                      "nullptr_t construction of multi_span<T> only possible "
-                      "for dynamic or fixed, zero-length spans.");
-    }
-
-    // construct from nullptr with size of 0 (helps with template function calls)
-    template <class IntType, typename = std::enable_if_t<std::is_integral<IntType>::value>>
-
-    // GSL_SUPPRESS(type.6) // NO-FORMAT: attribute // TODO: false positive // TODO: parser bug
-    constexpr multi_span(std::nullptr_t, IntType size) : multi_span(nullptr, bounds_type{})
-    {
-        static_assert(bounds_type::dynamic_rank != 0 ||
-                          (bounds_type::dynamic_rank == 0 && bounds_type::static_size == 0),
-                      "nullptr_t construction of multi_span<T> only possible "
-                      "for dynamic or fixed, zero-length spans.");
-        Expects(size == 0);
-    }
-
-    // construct from a single element
-
-    // clang-format off
-    GSL_SUPPRESS(type.6) // NO-FORMAT: attribute // TODO: false positive
-    // clang-format on
-    constexpr multi_span(reference data) noexcept : multi_span(&data, bounds_type{1})
-    {
-        static_assert(bounds_type::dynamic_rank > 0 || bounds_type::static_size == 0 ||
-                          bounds_type::static_size == 1,
-                      "Construction from a single element only possible "
-                      "for dynamic or fixed spans of length 0 or 1.");
-    }
-
-    // prevent constructing from temporaries for single-elements
-    constexpr multi_span(value_type &&) = delete;
-
-    // construct from pointer + length
-    // clang-format off
-    GSL_SUPPRESS(type.6) // NO-FORMAT: attribute // TODO: false positive
-    // clang-format on
-    constexpr multi_span(pointer ptr, size_type size) : multi_span(ptr, bounds_type{size}) {}
-
-    // construct from pointer + length - multidimensional
-    constexpr multi_span(pointer data, bounds_type bounds) : data_(data), bounds_(std::move(bounds))
-    {
-        Expects((bounds_.size() > 0 && data != nullptr) || bounds_.size() == 0);
-    }
-
-    // construct from begin,end pointer pair
-    template <typename Ptr,
-              typename = std::enable_if_t<std::is_convertible<Ptr, pointer>::value &&
-                                          details::LessThan<bounds_type::dynamic_rank, 2>::value>>
-    constexpr multi_span(pointer begin, Ptr end)
-        : multi_span(begin,
-                     details::newBoundsHelper<bounds_type>(static_cast<pointer>(end) - begin))
-    {
-        Expects(begin != nullptr && end != nullptr && begin <= static_cast<pointer>(end));
-    }
-
-    // construct from n-dimensions static array
-    template <typename T, std::size_t N, typename Helper = details::SpanArrayTraits<T, N>>
-    constexpr multi_span(T(&arr)[N])
-        : multi_span(reinterpret_cast<pointer>(arr), bounds_type{typename Helper::bounds_type{}})
-    {
-        static_assert(std::is_convertible<typename Helper::value_type(*)[], value_type(*)[]>::value,
-                      "Cannot convert from source type to target multi_span type.");
-        static_assert(std::is_convertible<typename Helper::bounds_type, bounds_type>::value,
-                      "Cannot construct a multi_span from an array with fewer elements.");
-    }
-
-    // construct from n-dimensions dynamic array (e.g. new int[m][4])
-    // (precedence will be lower than the 1-dimension pointer)
-    template <typename T, typename Helper = details::SpanArrayTraits<T, dynamic_range>>
-    constexpr multi_span(T* const& data, size_type size)
-        : multi_span(reinterpret_cast<pointer>(data), typename Helper::bounds_type{size})
-    {
-        static_assert(std::is_convertible<typename Helper::value_type(*)[], value_type(*)[]>::value,
-                      "Cannot convert from source type to target multi_span type.");
-    }
-
-    // construct from std::array
-    template <typename T, std::size_t N>
-    constexpr multi_span(std::array<T, N> & arr)
-        : multi_span(arr.data(), bounds_type{static_bounds<N>{}})
-    {
-        static_assert(
-            std::is_convertible<T(*)[], typename std::remove_const_t<value_type>(*)[]>::value,
-            "Cannot convert from source type to target multi_span type.");
-        static_assert(std::is_convertible<static_bounds<N>, bounds_type>::value,
-                      "You cannot construct a multi_span from a std::array of smaller size.");
-    }
-
-    // construct from const std::array
-    template <typename T, std::size_t N>
-    constexpr multi_span(const std::array<T, N>& arr)
-        : multi_span(arr.data(), bounds_type{static_bounds<N>{}})
-    {
-        static_assert(
-            std::is_convertible<T(*)[], typename std::remove_const_t<value_type>(*)[]>::value,
-            "Cannot convert from source type to target multi_span type.");
-        static_assert(std::is_convertible<static_bounds<N>, bounds_type>::value,
-                      "You cannot construct a multi_span from a std::array of smaller size.");
-    }
-
-    // prevent constructing from temporary std::array
-    template <typename T, std::size_t N>
-    constexpr multi_span(std::array<T, N> && arr) = delete;
-
-    // construct from containers
-    // future: could use contiguous_iterator_traits to identify only contiguous containers
-    // type-requirements: container must have .size(), operator[] which are value_type compatible
-    template <typename Cont, typename DataType = typename Cont::value_type,
-              typename = std::enable_if_t<
-                  !details::is_multi_span<Cont>::value &&
-                  std::is_convertible<DataType(*)[], value_type(*)[]>::value &&
-                  std::is_same<std::decay_t<decltype(std::declval<Cont>().size(),
-                                                     *std::declval<Cont>().data())>,
-                               DataType>::value>>
-    constexpr multi_span(Cont & cont)
-        : multi_span(static_cast<pointer>(cont.data()),
-                     details::newBoundsHelper<bounds_type>(narrow_cast<size_type>(cont.size())))
-    {}
-
-    // prevent constructing from temporary containers
-    template <typename Cont, typename DataType = typename Cont::value_type,
-              typename = std::enable_if_t<
-                  !details::is_multi_span<Cont>::value &&
-                  std::is_convertible<DataType(*)[], value_type(*)[]>::value &&
-                  std::is_same<std::decay_t<decltype(std::declval<Cont>().size(),
-                                                     *std::declval<Cont>().data())>,
-                               DataType>::value>>
-    explicit constexpr multi_span(Cont && cont) = delete;
-
-    // construct from a convertible multi_span
-    template <typename OtherValueType, std::ptrdiff_t... OtherDimensions,
-              typename OtherBounds = static_bounds<OtherDimensions...>,
-              typename = std::enable_if_t<std::is_convertible<OtherValueType, ValueType>::value &&
-                                          std::is_convertible<OtherBounds, bounds_type>::value>>
-    constexpr multi_span(multi_span<OtherValueType, OtherDimensions...> other)
-        : data_(other.data_), bounds_(other.bounds_)
-    {}
-
-    // trivial copy and move
-    constexpr multi_span(const multi_span&) = default;
-    constexpr multi_span(multi_span &&) = default;
-
-    // trivial assignment
-    constexpr multi_span& operator=(const multi_span&) = default;
-    constexpr multi_span& operator=(multi_span&&) = default;
-
-    // first() - extract the first Count elements into a new multi_span
-    template <std::ptrdiff_t Count>
-
-    constexpr multi_span<ValueType, Count> first() const
-    {
-        static_assert(Count >= 0, "Count must be >= 0.");
-        static_assert(bounds_type::static_size == dynamic_range ||
-                          Count <= bounds_type::static_size,
-                      "Count is out of bounds.");
-
-        Expects(bounds_type::static_size != dynamic_range || Count <= this->size());
-        return {this->data(), Count};
-    }
-
-    // first() - extract the first count elements into a new multi_span
-    constexpr multi_span<ValueType, dynamic_range> first(size_type count) const
-    {
-        Expects(count >= 0 && count <= this->size());
-        return {this->data(), count};
-    }
-
-    // last() - extract the last Count elements into a new multi_span
-    template <std::ptrdiff_t Count>
-    constexpr multi_span<ValueType, Count> last() const
-    {
-        static_assert(Count >= 0, "Count must be >= 0.");
-        static_assert(bounds_type::static_size == dynamic_range ||
-                          Count <= bounds_type::static_size,
-                      "Count is out of bounds.");
-
-        Expects(bounds_type::static_size != dynamic_range || Count <= this->size());
-        return {this->data() + this->size() - Count, Count};
-    }
-
-    // last() - extract the last count elements into a new multi_span
-    constexpr multi_span<ValueType, dynamic_range> last(size_type count) const
-    {
-        Expects(count >= 0 && count <= this->size());
-        return {this->data() + this->size() - count, count};
-    }
-
-    // subspan() - create a subview of Count elements starting at Offset
-    template <std::ptrdiff_t Offset, std::ptrdiff_t Count>
-    constexpr multi_span<ValueType, Count> subspan() const
-    {
-        static_assert(Count >= 0, "Count must be >= 0.");
-        static_assert(Offset >= 0, "Offset must be >= 0.");
-        static_assert(bounds_type::static_size == dynamic_range ||
-                          ((Offset <= bounds_type::static_size) &&
-                           Count <= bounds_type::static_size - Offset),
-                      "You must describe a sub-range within bounds of the multi_span.");
-
-        Expects(bounds_type::static_size != dynamic_range ||
-                (Offset <= this->size() && Count <= this->size() - Offset));
-        return {this->data() + Offset, Count};
-    }
-
-    // subspan() - create a subview of count elements starting at offset
-    // supplying dynamic_range for count will consume all available elements from offset
-    constexpr multi_span<ValueType, dynamic_range> subspan(size_type offset,
-                                                           size_type count = dynamic_range) const
-    {
-        Expects((offset >= 0 && offset <= this->size()) &&
-                (count == dynamic_range || (count <= this->size() - offset)));
-        return {this->data() + offset, count == dynamic_range ? this->length() - offset : count};
-    }
-
-    // section - creates a non-contiguous, strided multi_span from a contiguous one
-    constexpr strided_span<ValueType, Rank> section(index_type origin, index_type extents) const
-    {
-        const size_type size = this->bounds().total_size() - this->bounds().linearize(origin);
-        return {&this->operator[](origin), size,
-                strided_bounds<Rank>{extents, details::make_stride(bounds())}};
-    }
-
-    // length of the multi_span in elements
-    constexpr size_type size() const noexcept { return bounds_.size(); }
-
-    // length of the multi_span in elements
-    constexpr size_type length() const noexcept { return this->size(); }
-
-    // length of the multi_span in bytes
-    constexpr size_type size_bytes() const noexcept
-    {
-        return narrow_cast<size_type>(sizeof(value_type)) * this->size();
-    }
-
-    // length of the multi_span in bytes
-    constexpr size_type length_bytes() const noexcept { return this->size_bytes(); }
-
-    constexpr bool empty() const noexcept { return this->size() == 0; }
-
-    static constexpr std::size_t rank() { return Rank; }
-
-    template <std::size_t Dim = 0>
-    constexpr size_type extent() const noexcept
-    {
-        static_assert(Dim < Rank,
-                      "Dimension should be less than rank (dimension count starts from 0).");
-        return bounds_.template extent<Dim>();
-    }
-
-    template <typename IntType>
-    constexpr size_type extent(IntType dim) const
-    {
-        return bounds_.extent(dim);
-    }
-
-    constexpr bounds_type bounds() const noexcept { return bounds_; }
-
-    constexpr pointer data() const noexcept { return data_; }
-
-    template <typename FirstIndex>
-    constexpr reference operator()(FirstIndex idx)
-    {
-        return this->operator[](narrow_cast<std::ptrdiff_t>(idx));
-    }
-
-    template <typename FirstIndex, typename... OtherIndices>
-    constexpr reference operator()(FirstIndex firstIndex, OtherIndices... indices)
-    {
-        const index_type idx = {narrow_cast<std::ptrdiff_t>(firstIndex),
-                                narrow_cast<std::ptrdiff_t>(indices)...};
-        return this->operator[](idx);
-    }
-
-    // clang-format off
-    GSL_SUPPRESS(bounds.1) // NO-FORMAT: attribute
-    // clang-format on
-    constexpr reference operator[](const index_type& idx) const
-    {
-        return data_[bounds_.linearize(idx)];
-    }
-
-    template <bool Enabled = (Rank > 1), typename Ret = std::enable_if_t<Enabled, sliced_type>>
-
-    // clang-format off
-    GSL_SUPPRESS(bounds.1) // NO-FORMAT: attribute
-    // clang-format on
-    constexpr Ret operator[](size_type idx) const
-    {
-        Expects(idx >= 0 && idx < bounds_.size()); // index is out of bounds of the array
-        const size_type ridx = idx * bounds_.stride();
-
-        // index is out of bounds of the underlying data
-        Expects(ridx < bounds_.total_size());
-        return Ret{data_ + ridx, bounds_.slice()};
-    }
-
-    constexpr iterator begin() const noexcept { return iterator{this, true}; }
-
-    constexpr iterator end() const noexcept { return iterator{this, false}; }
-
-    // clang-format off
-    GSL_SUPPRESS(type.1) // NO-FORMAT: attribute
-    // clang-format on
-    constexpr const_iterator cbegin() const noexcept
-    {
-        return const_iterator{reinterpret_cast<const const_span*>(this), true};
-    }
-
-    constexpr const_iterator cend() const noexcept
-    {
-        return const_iterator{reinterpret_cast<const const_span*>(this), false};
-    }
-
-    constexpr reverse_iterator rbegin() const noexcept { return reverse_iterator{end()}; }
-
-    constexpr reverse_iterator rend() const noexcept { return reverse_iterator{begin()}; }
-
-    constexpr const_reverse_iterator crbegin() const noexcept
-    {
-        return const_reverse_iterator{cend()};
-    }
-
-    constexpr const_reverse_iterator crend() const noexcept
-    {
-        return const_reverse_iterator{cbegin()};
-    }
-
-    template <typename OtherValueType, std::ptrdiff_t... OtherDimensions,
-              typename = std::enable_if_t<std::is_same<std::remove_cv_t<value_type>,
-                                                       std::remove_cv_t<OtherValueType>>::value>>
-    constexpr bool operator==(const multi_span<OtherValueType, OtherDimensions...>& other) const
-    {
-        return bounds_.size() == other.bounds_.size() &&
-               (data_ == other.data_ || std::equal(this->begin(), this->end(), other.begin()));
-    }
-
-    template <typename OtherValueType, std::ptrdiff_t... OtherDimensions,
-              typename = std::enable_if_t<std::is_same<std::remove_cv_t<value_type>,
-                                                       std::remove_cv_t<OtherValueType>>::value>>
-    constexpr bool operator!=(const multi_span<OtherValueType, OtherDimensions...>& other) const
-    {
-        return !(*this == other);
-    }
-
-    template <typename OtherValueType, std::ptrdiff_t... OtherDimensions,
-              typename = std::enable_if_t<std::is_same<std::remove_cv_t<value_type>,
-                                                       std::remove_cv_t<OtherValueType>>::value>>
-    constexpr bool operator<(const multi_span<OtherValueType, OtherDimensions...>& other) const
-    {
-        return std::lexicographical_compare(this->begin(), this->end(), other.begin(), other.end());
-    }
-
-    template <typename OtherValueType, std::ptrdiff_t... OtherDimensions,
-              typename = std::enable_if_t<std::is_same<std::remove_cv_t<value_type>,
-                                                       std::remove_cv_t<OtherValueType>>::value>>
-    constexpr bool operator<=(const multi_span<OtherValueType, OtherDimensions...>& other) const
-    {
-        return !(other < *this);
-    }
-
-    template <typename OtherValueType, std::ptrdiff_t... OtherDimensions,
-              typename = std::enable_if_t<std::is_same<std::remove_cv_t<value_type>,
-                                                       std::remove_cv_t<OtherValueType>>::value>>
-    constexpr bool operator>(const multi_span<OtherValueType, OtherDimensions...>& other)
-        const noexcept
-    {
-        return (other < *this);
-    }
-
-    template <typename OtherValueType, std::ptrdiff_t... OtherDimensions,
-              typename = std::enable_if_t<std::is_same<std::remove_cv_t<value_type>,
-                                                       std::remove_cv_t<OtherValueType>>::value>>
-    constexpr bool operator>=(const multi_span<OtherValueType, OtherDimensions...>& other) const
-    {
-        return !(*this < other);
-    }
-};
-
-//
-// Free functions for manipulating spans
-//
-
-// reshape a multi_span into a different dimensionality
-// DimCount and Enabled here are workarounds for a bug in MSVC 2015
-template <typename SpanType, typename... Dimensions2, std::size_t DimCount = sizeof...(Dimensions2),
-          bool Enabled = (DimCount > 0), typename = std::enable_if_t<Enabled>>
-constexpr auto as_multi_span(SpanType s, Dimensions2... dims)
-    -> multi_span<typename SpanType::value_type, Dimensions2::value...>
-{
-    static_assert(details::is_multi_span<SpanType>::value,
-                  "Variadic as_multi_span() is for reshaping existing spans.");
-    using BoundsType =
-        typename multi_span<typename SpanType::value_type, (Dimensions2::value)...>::bounds_type;
-    const auto tobounds = details::static_as_multi_span_helper<BoundsType>(dims..., details::Sep{});
-    details::verifyBoundsReshape(s.bounds(), tobounds);
-    return {s.data(), tobounds};
-}
-
-// convert a multi_span<T> to a multi_span<const byte>
-template <typename U, std::ptrdiff_t... Dimensions>
-multi_span<const byte, dynamic_range> as_bytes(multi_span<U, Dimensions...> s) noexcept
-{
-    static_assert(std::is_trivial<std::decay_t<U>>::value,
-                  "The value_type of multi_span must be a trivial type.");
-    return {reinterpret_cast<const byte*>(s.data()), s.size_bytes()};
-}
-
-// convert a multi_span<T> to a multi_span<byte> (a writeable byte multi_span)
-// this is not currently a portable function that can be relied upon to work
-// on all implementations. It should be considered an experimental extension
-// to the standard GSL interface.
-template <typename U, std::ptrdiff_t... Dimensions>
-multi_span<byte> as_writeable_bytes(multi_span<U, Dimensions...> s) noexcept
-{
-    static_assert(std::is_trivial<std::decay_t<U>>::value,
-                  "The value_type of multi_span must be a trivial type.");
-    return {reinterpret_cast<byte*>(s.data()), s.size_bytes()};
-}
-
-// convert a multi_span<const byte> to a multi_span<const T>
-// this is not currently a portable function that can be relied upon to work
-// on all implementations. It should be considered an experimental extension
-// to the standard GSL interface.
-template <typename U, std::ptrdiff_t... Dimensions>
-constexpr auto as_multi_span(multi_span<const byte, Dimensions...> s) -> multi_span<
-    const U, static_cast<std::ptrdiff_t>(
-                 multi_span<const byte, Dimensions...>::bounds_type::static_size != dynamic_range
-                     ? (static_cast<std::size_t>(
-                            multi_span<const byte, Dimensions...>::bounds_type::static_size) /
-                        sizeof(U))
-                     : dynamic_range)>
-{
-    using ConstByteSpan = multi_span<const byte, Dimensions...>;
-    static_assert(
-        std::is_trivial<std::decay_t<U>>::value &&
-            (ConstByteSpan::bounds_type::static_size == dynamic_range ||
-             ConstByteSpan::bounds_type::static_size % narrow_cast<std::ptrdiff_t>(sizeof(U)) == 0),
-        "Target type must be a trivial type and its size must match the byte array size");
-
-    Expects((s.size_bytes() % narrow_cast<std::ptrdiff_t>(sizeof(U))) == 0 &&
-            (s.size_bytes() / narrow_cast<std::ptrdiff_t>(sizeof(U))) < PTRDIFF_MAX);
-    return {reinterpret_cast<const U*>(s.data()),
-            s.size_bytes() / narrow_cast<std::ptrdiff_t>(sizeof(U))};
-}
-
-// convert a multi_span<byte> to a multi_span<T>
-// this is not currently a portable function that can be relied upon to work
-// on all implementations. It should be considered an experimental extension
-// to the standard GSL interface.
-template <typename U, std::ptrdiff_t... Dimensions>
-constexpr auto as_multi_span(multi_span<byte, Dimensions...> s)
-    -> multi_span<U, narrow_cast<std::ptrdiff_t>(
-                         multi_span<byte, Dimensions...>::bounds_type::static_size != dynamic_range
-                             ? static_cast<std::size_t>(
-                                   multi_span<byte, Dimensions...>::bounds_type::static_size) /
-                                   sizeof(U)
-                             : dynamic_range)>
-{
-    using ByteSpan = multi_span<byte, Dimensions...>;
-    static_assert(std::is_trivial<std::decay_t<U>>::value &&
-                      (ByteSpan::bounds_type::static_size == dynamic_range ||
-                       ByteSpan::bounds_type::static_size % sizeof(U) == 0),
-                  "Target type must be a trivial type and its size must match the byte array size");
-
-    Expects((s.size_bytes() % sizeof(U)) == 0);
-    return {reinterpret_cast<U*>(s.data()),
-            s.size_bytes() / narrow_cast<std::ptrdiff_t>(sizeof(U))};
-}
-
-template <typename T, std::ptrdiff_t... Dimensions>
-constexpr auto as_multi_span(T* const& ptr, dim_t<Dimensions>... args)
-    -> multi_span<std::remove_all_extents_t<T>, Dimensions...>
-{
-    return {reinterpret_cast<std::remove_all_extents_t<T>*>(ptr),
-            details::static_as_multi_span_helper<static_bounds<Dimensions...>>(args...,
-                                                                               details::Sep{})};
-}
-
-template <typename T>
-constexpr auto as_multi_span(T* arr, std::ptrdiff_t len) ->
-    typename details::SpanArrayTraits<T, dynamic_range>::type
-{
-    return {reinterpret_cast<std::remove_all_extents_t<T>*>(arr), len};
-}
-
-template <typename T, std::size_t N>
-constexpr auto as_multi_span(T (&arr)[N]) -> typename details::SpanArrayTraits<T, N>::type
-{
-    return {arr};
-}
-
-template <typename T, std::size_t N>
-constexpr multi_span<const T, N> as_multi_span(const std::array<T, N>& arr)
-{
-    return {arr};
-}
-
-template <typename T, std::size_t N>
-constexpr multi_span<const T, N> as_multi_span(const std::array<T, N>&&) = delete;
-
-template <typename T, std::size_t N>
-constexpr multi_span<T, N> as_multi_span(std::array<T, N>& arr)
-{
-    return {arr};
-}
-
-template <typename T>
-constexpr multi_span<T, dynamic_range> as_multi_span(T* begin, T* end)
-{
-    return {begin, end};
-}
-
-template <typename Cont>
-constexpr auto as_multi_span(Cont& arr) -> std::enable_if_t<
-    !details::is_multi_span<std::decay_t<Cont>>::value,
-    multi_span<std::remove_reference_t<decltype(arr.size(), *arr.data())>, dynamic_range>>
-{
-    Expects(arr.size() < PTRDIFF_MAX);
-    return {arr.data(), narrow_cast<std::ptrdiff_t>(arr.size())};
-}
-
-template <typename Cont>
-constexpr auto as_multi_span(Cont&& arr) -> std::enable_if_t<
-    !details::is_multi_span<std::decay_t<Cont>>::value,
-    multi_span<std::remove_reference_t<decltype(arr.size(), *arr.data())>, dynamic_range>> = delete;
-
-// from basic_string which doesn't have nonconst .data() member like other contiguous containers
-template <typename CharT, typename Traits, typename Allocator>
-// clang-format off
-GSL_SUPPRESS(bounds.4) // NO-FORMAT: attribute
-// clang-format on
-constexpr auto as_multi_span(std::basic_string<CharT, Traits, Allocator>& str)
-    -> multi_span<CharT, dynamic_range>
-{
-    Expects(str.size() < PTRDIFF_MAX);
-    return {&str[0], narrow_cast<std::ptrdiff_t>(str.size())};
-}
-
-// strided_span is an extension that is not strictly part of the GSL at this time.
-// It is kept here while the multidimensional interface is still being defined.
-template <typename ValueType, std::size_t Rank>
-class [[deprecated(
-    "gsl::strided_span is deprecated because it is not in the C++ Core Guidelines")]] strided_span
-{
-public:
-    using bounds_type = strided_bounds<Rank>;
-    using size_type = typename bounds_type::size_type;
-    using index_type = typename bounds_type::index_type;
-    using value_type = ValueType;
-    using const_value_type = std::add_const_t<value_type>;
-    using pointer = std::add_pointer_t<value_type>;
-    using reference = std::add_lvalue_reference_t<value_type>;
-    using iterator = general_span_iterator<strided_span>;
-    using const_strided_span = strided_span<const_value_type, Rank>;
-    using const_iterator = general_span_iterator<const_strided_span>;
-    using reverse_iterator = std::reverse_iterator<iterator>;
-    using const_reverse_iterator = std::reverse_iterator<const_iterator>;
-    using sliced_type =
-        std::conditional_t<Rank == 1, value_type, strided_span<value_type, Rank - 1>>;
-
-private:
-    pointer data_;
-    bounds_type bounds_;
-
-    friend iterator;
-    friend const_iterator;
-    template <typename OtherValueType, std::size_t OtherRank>
-    friend class strided_span;
-
-public:
-    // from raw data
-    constexpr strided_span(pointer ptr, size_type size, bounds_type bounds)
-        : data_(ptr), bounds_(std::move(bounds))
-    {
-        Expects((bounds_.size() > 0 && ptr != nullptr) || bounds_.size() == 0);
-        // Bounds cross data boundaries
-        Expects(this->bounds().total_size() <= size);
-        // clang-format off
-        GSL_SUPPRESS(type.4) // NO-FORMAT: attribute // TODO: false positive
-        // clang-format on
-        (void) size;
-    }
-
-    // from static array of size N
-    template <size_type N>
-    constexpr strided_span(value_type(&values)[N], bounds_type bounds)
-        : strided_span(values, N, std::move(bounds))
-    {}
-
-    // from array view
-    template <typename OtherValueType, std::ptrdiff_t... Dimensions,
-              bool Enabled1 = (sizeof...(Dimensions) == Rank),
-              bool Enabled2 = std::is_convertible<OtherValueType*, ValueType*>::value,
-              typename = std::enable_if_t<Enabled1 && Enabled2>>
-    constexpr strided_span(multi_span<OtherValueType, Dimensions...> av, bounds_type bounds)
-        : strided_span(av.data(), av.bounds().total_size(), std::move(bounds))
-    {}
-
-    // convertible
-    template <typename OtherValueType, typename = std::enable_if_t<std::is_convertible<
-                                           OtherValueType(*)[], value_type(*)[]>::value>>
-    constexpr strided_span(const strided_span<OtherValueType, Rank>& other)
-        : data_(other.data_), bounds_(other.bounds_)
-    {}
-
-    // convert from bytes
-    template <typename OtherValueType>
-    constexpr strided_span<
-        typename std::enable_if<std::is_same<value_type, const byte>::value, OtherValueType>::type,
-        Rank>
-    as_strided_span() const
-    {
-        static_assert((sizeof(OtherValueType) >= sizeof(value_type)) &&
-                          (sizeof(OtherValueType) % sizeof(value_type) == 0),
-                      "OtherValueType should have a size to contain a multiple of ValueTypes");
-        auto d = narrow_cast<size_type>(sizeof(OtherValueType) / sizeof(value_type));
-
-        const size_type size = this->bounds().total_size() / d;
-
-        // clang-format off
-        GSL_SUPPRESS(type.3) // NO-FORMAT: attribute
-        // clang-format on
-        return {const_cast<OtherValueType*>(reinterpret_cast<const OtherValueType*>(this->data())),
-                size,
-                bounds_type{resize_extent(this->bounds().index_bounds(), d),
-                            resize_stride(this->bounds().strides(), d)}};
-    }
-
-    constexpr strided_span section(index_type origin, index_type extents) const
-    {
-        const size_type size = this->bounds().total_size() - this->bounds().linearize(origin);
-        return {&this->operator[](origin), size,
-                bounds_type{extents, details::make_stride(bounds())}};
-    }
-
-    // clang-format off
-    GSL_SUPPRESS(bounds.1) // NO-FORMAT: attribute
-    // clang-format on
-    constexpr reference operator[](const index_type& idx) const
-    {
-        return data_[bounds_.linearize(idx)];
-    }
-
-    template <bool Enabled = (Rank > 1), typename Ret = std::enable_if_t<Enabled, sliced_type>>
-    // clang-format off
-    GSL_SUPPRESS(bounds.1) // NO-FORMAT: attribute
-    // clang-format on
-    constexpr Ret operator[](size_type idx) const
-    {
-        Expects(idx < bounds_.size()); // index is out of bounds of the array
-        const size_type ridx = idx * bounds_.stride();
-
-        // index is out of bounds of the underlying data
-        Expects(ridx < bounds_.total_size());
-        return {data_ + ridx, bounds_.slice().total_size(), bounds_.slice()};
-    }
-
-    constexpr bounds_type bounds() const noexcept { return bounds_; }
-
-    template <std::size_t Dim = 0>
-    constexpr size_type extent() const noexcept
-    {
-        static_assert(Dim < Rank,
-                      "dimension should be less than Rank (dimension count starts from 0)");
-        return bounds_.template extent<Dim>();
-    }
-
-    constexpr size_type size() const noexcept { return bounds_.size(); }
-
-    constexpr pointer data() const noexcept { return data_; }
-
-    constexpr bool empty() const noexcept { return this->size() == 0; }
-
-    constexpr explicit operator bool() const noexcept { return data_ != nullptr; }
-
-    constexpr iterator begin() const { return iterator{this, true}; }
-
-    constexpr iterator end() const { return iterator{this, false}; }
-
-    constexpr const_iterator cbegin() const
-    {
-        return const_iterator{reinterpret_cast<const const_strided_span*>(this), true};
-    }
-
-    constexpr const_iterator cend() const
-    {
-        return const_iterator{reinterpret_cast<const const_strided_span*>(this), false};
-    }
-
-    constexpr reverse_iterator rbegin() const { return reverse_iterator{end()}; }
-
-    constexpr reverse_iterator rend() const { return reverse_iterator{begin()}; }
-
-    constexpr const_reverse_iterator crbegin() const { return const_reverse_iterator{cend()}; }
-
-    constexpr const_reverse_iterator crend() const { return const_reverse_iterator{cbegin()}; }
-
-    template <typename OtherValueType, std::ptrdiff_t OtherRank,
-              typename = std::enable_if_t<std::is_same<std::remove_cv_t<value_type>,
-                                                       std::remove_cv_t<OtherValueType>>::value>>
-    constexpr bool operator==(const strided_span<OtherValueType, OtherRank>& other) const
-    {
-        return bounds_.size() == other.bounds_.size() &&
-               (data_ == other.data_ || std::equal(this->begin(), this->end(), other.begin()));
-    }
-
-    template <typename OtherValueType, std::ptrdiff_t OtherRank,
-              typename = std::enable_if_t<std::is_same<std::remove_cv_t<value_type>,
-                                                       std::remove_cv_t<OtherValueType>>::value>>
-    constexpr bool operator!=(const strided_span<OtherValueType, OtherRank>& other) const
-    {
-        return !(*this == other);
-    }
-
-    template <typename OtherValueType, std::ptrdiff_t OtherRank,
-              typename = std::enable_if_t<std::is_same<std::remove_cv_t<value_type>,
-                                                       std::remove_cv_t<OtherValueType>>::value>>
-    constexpr bool operator<(const strided_span<OtherValueType, OtherRank>& other) const
-    {
-        return std::lexicographical_compare(this->begin(), this->end(), other.begin(), other.end());
-    }
-
-    template <typename OtherValueType, std::ptrdiff_t OtherRank,
-              typename = std::enable_if_t<std::is_same<std::remove_cv_t<value_type>,
-                                                       std::remove_cv_t<OtherValueType>>::value>>
-    constexpr bool operator<=(const strided_span<OtherValueType, OtherRank>& other) const
-    {
-        return !(other < *this);
-    }
-
-    template <typename OtherValueType, std::ptrdiff_t OtherRank,
-              typename = std::enable_if_t<std::is_same<std::remove_cv_t<value_type>,
-                                                       std::remove_cv_t<OtherValueType>>::value>>
-    constexpr bool operator>(const strided_span<OtherValueType, OtherRank>& other) const
-    {
-        return (other < *this);
-    }
-
-    template <typename OtherValueType, std::ptrdiff_t OtherRank,
-              typename = std::enable_if_t<std::is_same<std::remove_cv_t<value_type>,
-                                                       std::remove_cv_t<OtherValueType>>::value>>
-    constexpr bool operator>=(const strided_span<OtherValueType, OtherRank>& other) const
-    {
-        return !(*this < other);
-    }
-
-private:
-    static index_type resize_extent(const index_type& extent, std::ptrdiff_t d)
-    {
-        // The last dimension of the array needs to contain a multiple of new type elements
-        // clang-format off
-        GSL_SUPPRESS(bounds.4) // NO-FORMAT: attribute
-        // clang-format on
-        Expects(extent[Rank - 1] >= d && (extent[Rank - 1] % d == 0));
-
-        index_type ret = extent;
-        ret[Rank - 1] /= d;
-
-        return ret;
-    }
-
-    template <bool Enabled = (Rank == 1), typename = std::enable_if_t<Enabled>>
-    static index_type resize_stride(const index_type& strides, std::ptrdiff_t, void* = nullptr)
-    {
-        // Only strided arrays with regular strides can be resized
-        // clang-format off
-        GSL_SUPPRESS(bounds.4) // NO-FORMAT: attribute
-        // clang-format on
-        Expects(strides[Rank - 1] == 1);
-
-        return strides;
-    }
-
-    template <bool Enabled = (Rank > 1), typename = std::enable_if_t<Enabled>>
-    // clang-format off
-    GSL_SUPPRESS(bounds.4) // NO-FORMAT: attribute
-    // clang-format on
-    static index_type resize_stride(const index_type& strides, std::ptrdiff_t d)
-    {
-        // Only strided arrays with regular strides can be resized
-        Expects(strides[Rank - 1] == 1);
-        // The strides must have contiguous chunks of
-        // memory that can contain a multiple of new type elements
-        Expects(strides[Rank - 2] >= d && (strides[Rank - 2] % d == 0));
-
-        for (std::size_t i = Rank - 1; i > 0; --i)
-        {
-            // Only strided arrays with regular strides can be resized
-            Expects((strides[i - 1] >= strides[i]) && (strides[i - 1] % strides[i] == 0));
-        }
-
-        index_type ret = strides / d;
-        ret[Rank - 1] = 1;
-
-        return ret;
-    }
-};
-
-template <class Span>
-class [[deprecated]] contiguous_span_iterator
-{
-public:
-    using iterator_category = std::random_access_iterator_tag;
-    using value_type = typename Span::value_type;
-    using difference_type = std::ptrdiff_t;
-    using pointer = value_type*;
-    using reference = value_type&;
-
-private:
-    template <typename ValueType, std::ptrdiff_t FirstDimension, std::ptrdiff_t... RestDimensions>
-    friend class multi_span;
-
-    pointer data_;
-    const Span* m_validator;
-
-    // clang-format off
-    GSL_SUPPRESS(bounds.1) // NO-FORMAT: attribute
-    // clang-format on
-    void validateThis() const
-    {
-        // iterator is out of range of the array
-        Expects(data_ >= m_validator->data_ && data_ < m_validator->data_ + m_validator->size());
-    }
-
-    // clang-format off
-    GSL_SUPPRESS(bounds.1) // NO-FORMAT: attribute
-    // clang-format on
-    contiguous_span_iterator(const Span* container, bool isbegin)
-        : data_(isbegin ? container->data_ : container->data_ + container->size())
-        , m_validator(container)
-    {}
-
-public:
-    reference operator*() const
-    {
-        validateThis();
-        return *data_;
-    }
-    pointer operator->() const
-    {
-        validateThis();
-        return data_;
-    }
-
-    // clang-format off
-    GSL_SUPPRESS(bounds.1) // NO-FORMAT: attribute
-    // clang-format on
-    contiguous_span_iterator& operator++() noexcept
-    {
-        ++data_;
-        return *this;
-    }
-    contiguous_span_iterator operator++(int) noexcept
-    {
-        auto ret = *this;
-        ++(*this);
-        return ret;
-    }
-
-    // clang-format off
-    GSL_SUPPRESS(bounds.1) // NO-FORMAT: attribute
-    // clang-format on
-    contiguous_span_iterator& operator--() noexcept
-    {
-        --data_;
-        return *this;
-    }
-    contiguous_span_iterator operator--(int) noexcept
-    {
-        auto ret = *this;
-        --(*this);
-        return ret;
-    }
-    contiguous_span_iterator operator+(difference_type n) const noexcept
-    {
-        contiguous_span_iterator ret{*this};
-        return ret += n;
-    }
-    contiguous_span_iterator& operator+=(difference_type n) noexcept
-    {
-        data_ += n;
-        return *this;
-    }
-    contiguous_span_iterator operator-(difference_type n) const noexcept
-    {
-        contiguous_span_iterator ret{*this};
-        return ret -= n;
-    }
-
-    contiguous_span_iterator& operator-=(difference_type n) { return *this += -n; }
-    difference_type operator-(const contiguous_span_iterator& rhs) const
-    {
-        Expects(m_validator == rhs.m_validator);
-        return data_ - rhs.data_;
-    }
-    reference operator[](difference_type n) const { return *(*this + n); }
-    bool operator==(const contiguous_span_iterator& rhs) const
-    {
-        Expects(m_validator == rhs.m_validator);
-        return data_ == rhs.data_;
-    }
-
-    bool operator!=(const contiguous_span_iterator& rhs) const { return !(*this == rhs); }
-
-    bool operator<(const contiguous_span_iterator& rhs) const
-    {
-        Expects(m_validator == rhs.m_validator);
-        return data_ < rhs.data_;
-    }
-
-    bool operator<=(const contiguous_span_iterator& rhs) const { return !(rhs < *this); }
-    bool operator>(const contiguous_span_iterator& rhs) const { return rhs < *this; }
-    bool operator>=(const contiguous_span_iterator& rhs) const { return !(rhs > *this); }
-
-    void swap(contiguous_span_iterator& rhs) noexcept
-    {
-        std::swap(data_, rhs.data_);
-        std::swap(m_validator, rhs.m_validator);
-    }
-};
-
-template <typename Span>
-contiguous_span_iterator<Span> operator+(typename contiguous_span_iterator<Span>::difference_type n,
-                                         const contiguous_span_iterator<Span>& rhs) noexcept
-{
-    return rhs + n;
-}
-
-template <typename Span>
-class [[deprecated]] general_span_iterator
-{
-public:
-    using iterator_category = std::random_access_iterator_tag;
-    using value_type = typename Span::value_type;
-    using difference_type = std::ptrdiff_t;
-    using pointer = value_type*;
-    using reference = value_type&;
-
-private:
-    template <typename ValueType, std::size_t Rank>
-    friend class strided_span;
-
-    const Span* m_container;
-    typename Span::bounds_type::iterator m_itr;
-    general_span_iterator(const Span* container, bool isbegin)
-        : m_container(container)
-        , m_itr(isbegin ? m_container->bounds().begin() : m_container->bounds().end())
-    {}
-
-public:
-    reference operator*() noexcept { return (*m_container)[*m_itr]; }
-    pointer operator->() noexcept { return &(*m_container)[*m_itr]; }
-    general_span_iterator& operator++() noexcept
-    {
-        ++m_itr;
-        return *this;
-    }
-    general_span_iterator operator++(int) noexcept
-    {
-        auto ret = *this;
-        ++(*this);
-        return ret;
-    }
-    general_span_iterator& operator--() noexcept
-    {
-        --m_itr;
-        return *this;
-    }
-    general_span_iterator operator--(int) noexcept
-    {
-        auto ret = *this;
-        --(*this);
-        return ret;
-    }
-    general_span_iterator operator+(difference_type n) const noexcept
-    {
-        general_span_iterator ret{*this};
-        return ret += n;
-    }
-    general_span_iterator& operator+=(difference_type n) noexcept
-    {
-        m_itr += n;
-        return *this;
-    }
-    general_span_iterator operator-(difference_type n) const noexcept
-    {
-        general_span_iterator ret{*this};
-        return ret -= n;
-    }
-    general_span_iterator& operator-=(difference_type n) noexcept { return *this += -n; }
-    difference_type operator-(const general_span_iterator& rhs) const
-    {
-        Expects(m_container == rhs.m_container);
-        return m_itr - rhs.m_itr;
-    }
-
-    // clang-format off
-    GSL_SUPPRESS(bounds.4) // NO-FORMAT: attribute
-    // clang-format on
-    value_type operator[](difference_type n) const { return (*m_container)[m_itr[n]]; }
-
-    bool operator==(const general_span_iterator& rhs) const
-    {
-        Expects(m_container == rhs.m_container);
-        return m_itr == rhs.m_itr;
-    }
-    bool operator!=(const general_span_iterator& rhs) const { return !(*this == rhs); }
-    bool operator<(const general_span_iterator& rhs) const
-    {
-        Expects(m_container == rhs.m_container);
-        return m_itr < rhs.m_itr;
-    }
-    bool operator<=(const general_span_iterator& rhs) const { return !(rhs < *this); }
-    bool operator>(const general_span_iterator& rhs) const { return rhs < *this; }
-    bool operator>=(const general_span_iterator& rhs) const { return !(rhs > *this); }
-    void swap(general_span_iterator& rhs) noexcept
-    {
-        std::swap(m_itr, rhs.m_itr);
-        std::swap(m_container, rhs.m_container);
-    }
-};
-
-template <typename Span>
-general_span_iterator<Span> operator+(typename general_span_iterator<Span>::difference_type n,
-                                      const general_span_iterator<Span>& rhs) noexcept
-{
-    return rhs + n;
-}
-
-} // namespace gsl
-
-#if defined(_MSC_VER) && !defined(__clang__)
-
-#pragma warning(pop)
-
-#endif // _MSC_VER
-
-#if defined(__GNUC__) && __GNUC__ > 6
-#pragma GCC diagnostic pop
-#endif // __GNUC__ > 6
-
-#if defined(__GNUC__) || defined(__clang__)
-#pragma GCC diagnostic pop
-#endif
-
-#endif // GSL_MULTI_SPAN_H
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index a4bd7e6..c323961 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -167,11 +167,8 @@ endfunction()
 add_gsl_test(span_tests)
 add_gsl_test(span_ext_tests)
 add_gsl_test(span_compatibility_tests)
-add_gsl_test(multi_span_tests)
-add_gsl_test(strided_span_tests)
 add_gsl_test(string_span_tests)
 add_gsl_test(at_tests)
-add_gsl_test(bounds_tests)
 add_gsl_test(notnull_tests)
 add_gsl_test(assertion_tests)
 add_gsl_test(utils_tests)
diff --git a/tests/bounds_tests.cpp b/tests/bounds_tests.cpp
deleted file mode 100644
index 9c2fb96..0000000
--- a/tests/bounds_tests.cpp
+++ /dev/null
@@ -1,102 +0,0 @@
-///////////////////////////////////////////////////////////////////////////////
-//
-// Copyright (c) 2015 Microsoft Corporation. All rights reserved.
-//
-// This code is licensed under the MIT License (MIT).
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-//
-///////////////////////////////////////////////////////////////////////////////
-
-#include <gtest/gtest.h>
-
-#include <gsl/multi_span> // for static_bounds, static_bounds_dynamic_range_t
-
-#include <cstddef> // for ptrdiff_t, size_t
-
-using namespace std;
-using namespace gsl;
-
-namespace
-{
-void use(std::ptrdiff_t&) {}
-}
-
-TEST(bounds_tests, basic_bounds)
-{
-    for (auto point : static_bounds<dynamic_range, 3, 4>{2}) {
-        for (decltype(point)::size_type j = 0;
-             j < static_cast<decltype(point)::size_type>(decltype(point)::rank); j++)
-        {
-            use(j);
-            use(point[static_cast<std::size_t>(j)]);
-        }
-    }
-}
-
-TEST(bounds_tests, bounds_basic)
-{
-    static_bounds<3, 4, 5> b;
-    const auto a = b.slice();
-    (void) a;
-    static_bounds<4, dynamic_range, 2> x{4};
-    x.slice().slice();
-}
-
-TEST(bounds_tests, arrayview_iterator)
-{
-    static_bounds<4, dynamic_range, 2> bounds{3};
-
-    const auto itr = bounds.begin();
-    (void) itr;
-#ifdef CONFIRM_COMPILATION_ERRORS
-    multi_span<int, 4, dynamic_range, 2> av(nullptr, bounds);
-
-    auto itr2 = av.cbegin();
-
-    for (auto& v : av) {
-        v = 4;
-    }
-    fill(av.begin(), av.end(), 0);
-#endif
-}
-
-TEST(bounds_tests, bounds_convertible)
-{
-    static_bounds<7, 4, 2> b1;
-    static_bounds<7, dynamic_range, 2> b2 = b1;
-    (void) b2;
-#ifdef CONFIRM_COMPILATION_ERRORS
-    static_bounds<7, dynamic_range, 1> b4 = b2;
-#endif
-
-    static_bounds<dynamic_range, dynamic_range, dynamic_range> b3 = b1;
-    static_bounds<7, 4, 2> b4 = b3;
-    (void) b4;
-
-    static_bounds<dynamic_range> b5;
-    static_bounds<34> b6;
-
-    std::set_terminate([] {
-        std::cerr << "Expected Death. bounds_convertible";
-        std::abort();
-    });
-
-    b5 = static_bounds<20>();
-    EXPECT_DEATH(b6 = b5, ".*");
-    b5 = static_bounds<34>();
-    b6 = b5;
-
-    EXPECT_TRUE(b5 == b6);
-    EXPECT_TRUE(b5.size() == b6.size());
-}
-
-#ifdef CONFIRM_COMPILATION_ERRORS
-copy(src_span_static, dst_span_static);
-#endif
diff --git a/tests/multi_span_tests.cpp b/tests/multi_span_tests.cpp
deleted file mode 100644
index 9f93315..0000000
--- a/tests/multi_span_tests.cpp
+++ /dev/null
@@ -1,1866 +0,0 @@
-///////////////////////////////////////////////////////////////////////////////
-//
-// Copyright (c) 2015 Microsoft Corporation. All rights reserved.
-//
-// This code is licensed under the MIT License (MIT).
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-//
-///////////////////////////////////////////////////////////////////////////////
-
-#include <gtest/gtest.h>
-
-#include <gsl/byte>   // for byte
-#include <gsl/util>   // for narrow_cast
-#include <gsl/multi_span> // for multi_span, contiguous_span_iterator, dim
-
-#include <algorithm> // for fill, for_each
-#include <array>     // for array
-#include <iostream>  // for ptrdiff_t, size_t
-#include <iterator>  // for reverse_iterator, begin, end, operator!=
-#include <numeric>   // for iota
-#include <stddef.h>  // for ptrdiff_t
-#include <string>    // for string
-#include <vector>    // for vector
-
-namespace gsl
-{
-struct fail_fast;
-} // namespace gsl
-
-using namespace std;
-using namespace gsl;
-
-namespace
-{
-static constexpr char deathstring[] = "Expected Death";
-struct BaseClass
-{
-};
-struct DerivedClass : BaseClass
-{
-};
-
-void overloaded_func(multi_span<const int, dynamic_range, 3, 5> exp, int expected_value)
-{
-    for (auto val : exp) { EXPECT_TRUE(val == expected_value); }
-}
-
-void overloaded_func(multi_span<const char, dynamic_range, 3, 5> exp, char expected_value)
-{
-    for (auto val : exp) { EXPECT_TRUE(val == expected_value); }
-}
-
-void iterate_second_column(multi_span<int, dynamic_range, dynamic_range> av)
-{
-    auto length = av.size() / 2;
-
-    // view to the second column
-    auto section = av.section({0, 1}, {length, 1});
-
-    EXPECT_TRUE(section.size() == length);
-    for (auto i = 0; i < section.size(); ++i) { EXPECT_TRUE(section[i][0] == av[i][1]); }
-
-    for (auto i = 0; i < section.size(); ++i)
-    {
-        auto idx = multi_span_index<2>{i, 0}; // avoid braces inside the CHECK macro
-        EXPECT_TRUE(section[idx] == av[i][1]);
-    }
-
-    EXPECT_TRUE(section.bounds().index_bounds()[0] == length);
-    EXPECT_TRUE(section.bounds().index_bounds()[1] == 1);
-    for (auto i = 0; i < section.bounds().index_bounds()[0]; ++i)
-    {
-        for (auto j = 0; j < section.bounds().index_bounds()[1]; ++j)
-        {
-            auto idx = multi_span_index<2>{i, j}; // avoid braces inside the CHECK macro
-            EXPECT_TRUE(section[idx] == av[i][1]);
-        }
-    }
-
-    auto check_sum = 0;
-    for (auto i = 0; i < length; ++i) { check_sum += av[i][1]; }
-
-    {
-        auto idx = 0;
-        auto sum = 0;
-        for (auto num : section)
-        {
-            EXPECT_TRUE(num == av[idx][1]);
-            sum += num;
-            idx++;
-        }
-
-        EXPECT_TRUE(sum == check_sum);
-    }
-    {
-        auto idx = length - 1;
-        auto sum = 0;
-        for (auto iter = section.rbegin(); iter != section.rend(); ++iter)
-        {
-            EXPECT_TRUE(*iter == av[idx][1]);
-            sum += *iter;
-            idx--;
-        }
-
-        EXPECT_TRUE(sum == check_sum);
-    }
-}
-template <class Bounds>
-void fn(const Bounds&)
-{
-    static_assert(Bounds::static_size == 60, "static bounds is wrong size");
-}
-
-} // namespace
-
-TEST(multi_span_test, default_constructor)
-{
-    {
-        multi_span<int> s;
-        EXPECT_TRUE(s.length() ==  0);
-        EXPECT_TRUE(s.data() == nullptr);
-
-        multi_span<const int> cs;
-        EXPECT_TRUE(cs.length() ==  0);
-        EXPECT_TRUE(cs.data() == nullptr);
-    }
-
-    {
-        multi_span<int, 0> s;
-        EXPECT_TRUE(s.length() ==  0);
-        EXPECT_TRUE(s.data() == nullptr);
-
-        multi_span<const int, 0> cs;
-        EXPECT_TRUE(cs.length() ==  0);
-        EXPECT_TRUE(cs.data() == nullptr);
-    }
-
-    {
-#ifdef CONFIRM_COMPILATION_ERRORS
-        multi_span<int, 1> s;
-        EXPECT_TRUE(s.length() ==  1);
-        EXPECT_TRUE(s.data() == nullptr); // explains why it can't compile
-#endif
-    }
-
-    {
-        multi_span<int> s{};
-        EXPECT_TRUE(s.length() ==  0);
-        EXPECT_TRUE(s.data() == nullptr);
-
-        multi_span<const int> cs{};
-        EXPECT_TRUE(cs.length() ==  0);
-        EXPECT_TRUE(cs.data() == nullptr);
-    }
-}
-
-TEST(multi_span_test, from_nullptr_constructor)
-{
-    {
-        multi_span<int> s = nullptr;
-        EXPECT_TRUE(s.length() ==  0);
-        EXPECT_TRUE(s.data() == nullptr);
-
-        multi_span<const int> cs = nullptr;
-        EXPECT_TRUE(cs.length() ==  0);
-        EXPECT_TRUE(cs.data() == nullptr);
-    }
-
-    {
-        multi_span<int, 0> s = nullptr;
-        EXPECT_TRUE(s.length() ==  0);
-        EXPECT_TRUE(s.data() == nullptr);
-
-        multi_span<const int, 0> cs = nullptr;
-        EXPECT_TRUE(cs.length() ==  0);
-        EXPECT_TRUE(cs.data() == nullptr);
-    }
-
-    {
-#ifdef CONFIRM_COMPILATION_ERRORS
-        multi_span<int, 1> s = nullptr;
-        EXPECT_TRUE(s.length() ==  1);
-        EXPECT_TRUE(s.data() == nullptr); // explains why it can't compile
-#endif
-    }
-
-    {
-        multi_span<int> s{nullptr};
-        EXPECT_TRUE(s.length() ==  0);
-        EXPECT_TRUE(s.data() == nullptr);
-
-        multi_span<const int> cs{nullptr};
-        EXPECT_TRUE(cs.length() ==  0);
-        EXPECT_TRUE(cs.data() == nullptr);
-    }
-
-    {
-        multi_span<int*> s{nullptr};
-        EXPECT_TRUE(s.length() ==  0);
-        EXPECT_TRUE(s.data() == nullptr);
-
-        multi_span<const int*> cs{nullptr};
-        EXPECT_TRUE(cs.length() ==  0);
-        EXPECT_TRUE(cs.data() == nullptr);
-    }
-}
-
-TEST(multi_span_test, from_nullptr_length_constructor) {
-    {
-        multi_span<int> s{nullptr, 0};
-        EXPECT_TRUE(s.length() ==  0);
-        EXPECT_TRUE(s.data() == nullptr);
-
-        multi_span<const int> cs{nullptr, 0};
-        EXPECT_TRUE(cs.length() ==  0);
-        EXPECT_TRUE(cs.data() == nullptr);
-    }
-
-    {
-        multi_span<int, 0> s{nullptr, 0};
-        EXPECT_TRUE(s.length() ==  0);
-        EXPECT_TRUE(s.data() == nullptr);
-
-        multi_span<const int, 0> cs{nullptr, 0};
-        EXPECT_TRUE(cs.length() ==  0);
-        EXPECT_TRUE(cs.data() == nullptr);
-    }
-
-    std::set_terminate([] {
-        std::cerr << "Expected Death. from_nullptr_length_constructor";
-        std::abort();
-    });
-
-    {
-        auto workaround_macro = []() { const multi_span<int> s{nullptr, 1}; };
-        EXPECT_DEATH(workaround_macro(), deathstring);
-
-        auto const_workaround_macro = []() { const multi_span<const int> cs{nullptr, 1}; };
-        EXPECT_DEATH(const_workaround_macro(), deathstring);
-    }
-
-    {
-        auto workaround_macro = []() { const multi_span<int, 0> s{nullptr, 1}; };
-        EXPECT_DEATH(workaround_macro(), deathstring);
-
-        auto const_workaround_macro = []() { const multi_span<const int, 0> s{nullptr, 1}; };
-        EXPECT_DEATH(const_workaround_macro(), deathstring);
-    }
-
-    {
-        multi_span<int*> s{nullptr, 0};
-        EXPECT_TRUE(s.length() ==  0);
-        EXPECT_TRUE(s.data() == nullptr);
-
-        multi_span<const int*> cs{nullptr, 0};
-        EXPECT_TRUE(cs.length() ==  0);
-        EXPECT_TRUE(cs.data() == nullptr);
-    }
-
-    {
-#ifdef CONFIRM_COMPILATION_ERRORS
-        multi_span<int, 1> s{nullptr, 0};
-        EXPECT_TRUE(s.length() ==  1);
-        EXPECT_TRUE(s.data() == nullptr); // explains why it can't compile
-#endif
-    }
-}
-
-TEST(multi_span_test, from_element_constructor)
-{
-    int i = 5;
-
-    {
-        multi_span<int> s = i;
-        EXPECT_TRUE(s.length() ==  1);
-        EXPECT_TRUE(s.data() == &i);
-        EXPECT_TRUE(s[0] == 5);
-
-        multi_span<const int> cs = i;
-        EXPECT_TRUE(cs.length() ==  1);
-        EXPECT_TRUE(cs.data() == &i);
-        EXPECT_TRUE(cs[0] == 5);
-    }
-
-    {
-#ifdef CONFIRM_COMPILATION_ERRORS
-        const j = 1;
-        multi_span<int, 0> s = j;
-#endif
-    }
-
-    {
-#ifdef CONFIRM_COMPILATION_ERRORS
-        multi_span<int, 0> s = i;
-        EXPECT_TRUE(s.length() ==  0);
-        EXPECT_TRUE(s.data() == &i);
-#endif
-    }
-
-    {
-        multi_span<int, 1> s = i;
-        EXPECT_TRUE(s.length() ==  1);
-        EXPECT_TRUE(s.data() == &i);
-        EXPECT_TRUE(s[0] == 5);
-    }
-
-    {
-#ifdef CONFIRM_COMPILATION_ERRORS
-        multi_span<int, 2> s = i;
-        EXPECT_TRUE(s.length() ==  2);
-        EXPECT_TRUE(s.data() == &i);
-#endif
-    }
-
-    {
-#ifdef CONFIRM_COMPILATION_ERRORS
-        auto get_a_temp = []() -> int { return 4; };
-        auto use_a_span = [](multi_span<int> s) { (void) s; };
-        use_a_span(get_a_temp());
-#endif
-    }
-}
-
-TEST(multi_span_test, from_pointer_length_constructor)
-{
-    int arr[4] = {1, 2, 3, 4};
-
-    {
-        multi_span<int> s{&arr[0], 2};
-        EXPECT_TRUE(s.length() ==  2);
-        EXPECT_TRUE(s.data() == &arr[0]);
-        EXPECT_TRUE(s[0] ==  1);
-        EXPECT_TRUE(s[1] == 2);
-    }
-
-    {
-        multi_span<int, 2> s{&arr[0], 2};
-        EXPECT_TRUE(s.length() ==  2);
-        EXPECT_TRUE(s.data() == &arr[0]);
-        EXPECT_TRUE(s[0] ==  1);
-        EXPECT_TRUE(s[1] == 2);
-    }
-
-    {
-        int* p = nullptr;
-        multi_span<int> s{p, 0};
-        EXPECT_TRUE(s.length() ==  0);
-        EXPECT_TRUE(s.data() == nullptr);
-    }
-
-    std::set_terminate([] {
-        std::cerr << "Expected Death. from_pointer_length_constructor";
-        std::abort();
-    });
-
-    {
-        int* p = nullptr;
-        auto workaround_macro = [=]() { const multi_span<int> s{p, 2}; };
-        EXPECT_DEATH(workaround_macro(), deathstring);
-    }
-}
-
-TEST(multi_span_test, from_pointer_pointer_constructor)
-{
-    int arr[4] = {1, 2, 3, 4};
-
-    {
-        multi_span<int> s{&arr[0], &arr[2]};
-        EXPECT_TRUE(s.length() ==  2);
-        EXPECT_TRUE(s.data() == &arr[0]);
-        EXPECT_TRUE(s[0] ==  1);
-        EXPECT_TRUE(s[1] == 2);
-    }
-
-    {
-        multi_span<int, 2> s{&arr[0], &arr[2]};
-        EXPECT_TRUE(s.length() ==  2);
-        EXPECT_TRUE(s.data() == &arr[0]);
-        EXPECT_TRUE(s[0] ==  1);
-        EXPECT_TRUE(s[1] == 2);
-    }
-
-    {
-        multi_span<int> s{&arr[0], &arr[0]};
-        EXPECT_TRUE(s.length() ==  0);
-        EXPECT_TRUE(s.data() == &arr[0]);
-    }
-
-    {
-        multi_span<int, 0> s{&arr[0], &arr[0]};
-        EXPECT_TRUE(s.length() ==  0);
-        EXPECT_TRUE(s.data() == &arr[0]);
-    }
-
-
-    std::set_terminate([] {
-        std::cerr << "Expected Death. from_pointer_pointer_constructor";
-        std::abort();
-    });
-
-    {
-        auto workaround_macro = [&]() { const multi_span<int> s{&arr[1], &arr[0]}; };
-        EXPECT_DEATH(workaround_macro(), deathstring);
-    }
-
-    {
-        int* p = nullptr;
-        auto workaround_macro = [&]() { const multi_span<int> s{&arr[0], p}; };
-        EXPECT_DEATH(workaround_macro(), deathstring);
-    }
-
-    {
-        int* p = nullptr;
-        auto workaround_macro = [&]() { const multi_span<int> s{p, p}; };
-        EXPECT_DEATH(workaround_macro(), deathstring);
-    }
-
-    {
-        int* p = nullptr;
-        auto workaround_macro = [&]() { const multi_span<int> s{&arr[0], p}; };
-        EXPECT_DEATH(workaround_macro(), deathstring);
-    }
-}
-
-TEST(multi_span_test, from_array_constructor)
-{
-    int arr[5] = {1, 2, 3, 4, 5};
-
-    {
-        multi_span<int> s{arr};
-        EXPECT_TRUE(s.length() ==  5);
-        EXPECT_TRUE(s.data() == &arr[0]);
-    }
-
-    {
-        multi_span<int, 5> s{arr};
-        EXPECT_TRUE(s.length() ==  5);
-        EXPECT_TRUE(s.data() == &arr[0]);
-    }
-
-    {
-#ifdef CONFIRM_COMPILATION_ERRORS
-        multi_span<int, 6> s{arr};
-#endif
-    }
-
-    {
-        multi_span<int, 0> s{arr};
-        EXPECT_TRUE(s.length() ==  0);
-        EXPECT_TRUE(s.data() == &arr[0]);
-    }
-
-    int arr2d[2][3] = {1, 2, 3, 4, 5, 6};
-
-    {
-        multi_span<int> s{arr2d};
-        EXPECT_TRUE(s.length() ==  6);
-        EXPECT_TRUE(s.data() == &arr2d[0][0]);
-        EXPECT_TRUE(s[0] ==  1);
-        EXPECT_TRUE(s[5] == 6);
-    }
-
-    {
-        multi_span<int, 0> s{arr2d};
-        EXPECT_TRUE(s.length() ==  0);
-        EXPECT_TRUE(s.data() == &arr2d[0][0]);
-    }
-
-    {
-#ifdef CONFIRM_COMPILATION_ERRORS
-        multi_span<int, 5> s{arr2d};
-#endif
-    }
-
-    {
-        multi_span<int, 6> s{arr2d};
-        EXPECT_TRUE(s.length() ==  6);
-        EXPECT_TRUE(s.data() == &arr2d[0][0]);
-        EXPECT_TRUE(s[0] ==  1);
-        EXPECT_TRUE(s[5] == 6);
-    }
-
-    {
-#ifdef CONFIRM_COMPILATION_ERRORS
-        multi_span<int, 7> s{arr2d};
-#endif
-    }
-
-    {
-        multi_span<int[3]> s{arr2d[0]};
-        EXPECT_TRUE(s.length() ==  1);
-        EXPECT_TRUE(s.data() == &arr2d[0]);
-    }
-
-    {
-        multi_span<int, 2, 3> s{arr2d};
-        EXPECT_TRUE(s.length() ==  6);
-        EXPECT_TRUE(s.data() == &arr2d[0][0]);
-        auto workaround_macro = [&]() { return s[{1, 2}] == 6; };
-        EXPECT_TRUE(workaround_macro());
-    }
-
-    {
-#ifdef CONFIRM_COMPILATION_ERRORS
-        multi_span<int, 3, 3> s{arr2d};
-#endif
-    }
-
-    int arr3d[2][3][2] = {1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12};
-
-    {
-        multi_span<int> s{arr3d};
-        EXPECT_TRUE(s.length() ==  12);
-        EXPECT_TRUE(s.data() == &arr3d[0][0][0]);
-        EXPECT_TRUE(s[0] ==  1);
-        EXPECT_TRUE(s[11] == 12);
-    }
-
-    {
-        multi_span<int, 0> s{arr3d};
-        EXPECT_TRUE(s.length() ==  0);
-        EXPECT_TRUE(s.data() == &arr3d[0][0][0]);
-    }
-
-    {
-#ifdef CONFIRM_COMPILATION_ERRORS
-        multi_span<int, 11> s{arr3d};
-#endif
-    }
-
-    {
-        multi_span<int, 12> s{arr3d};
-        EXPECT_TRUE(s.length() ==  12);
-        EXPECT_TRUE(s.data() == &arr3d[0][0][0]);
-        EXPECT_TRUE(s[0] ==  1);
-        EXPECT_TRUE(s[5] == 6);
-    }
-
-    {
-#ifdef CONFIRM_COMPILATION_ERRORS
-        multi_span<int, 13> s{arr3d};
-#endif
-    }
-
-    {
-        multi_span<int[3][2]> s{arr3d[0]};
-        EXPECT_TRUE(s.length() ==  1);
-        EXPECT_TRUE(s.data() == &arr3d[0]);
-    }
-
-    {
-        multi_span<int, 3, 2, 2> s{arr3d};
-        EXPECT_TRUE(s.length() ==  12);
-        EXPECT_TRUE(s.data() == &arr3d[0][0][0]);
-        auto workaround_macro = [&]() { return s[{2, 1, 0}] == 11; };
-        EXPECT_TRUE(workaround_macro());
-    }
-
-    {
-#ifdef CONFIRM_COMPILATION_ERRORS
-        multi_span<int, 3, 3, 3> s{arr3d};
-#endif
-    }
-}
-
-TEST(multi_span_test, from_dynamic_array_constructor)
-{
-    double(*arr)[3][4] = new double[100][3][4];
-
-    std::set_terminate([] {
-        std::cerr << "Expected Death. from_nullptr_length_constructor";
-        std::abort();
-    });
-
-    {
-        multi_span<double, dynamic_range, 3, 4> s(arr, 10);
-        EXPECT_TRUE(s.length() ==  120);
-        EXPECT_TRUE(s.data() == &arr[0][0][0]);
-        EXPECT_DEATH(s[10][3][4], deathstring);
-    }
-
-    {
-        multi_span<double, dynamic_range, 4, 3> s(arr, 10);
-        EXPECT_TRUE(s.length() ==  120);
-        EXPECT_TRUE(s.data() == &arr[0][0][0]);
-    }
-
-    {
-        multi_span<double> s(arr, 10);
-        EXPECT_TRUE(s.length() ==  120);
-        EXPECT_TRUE(s.data() == &arr[0][0][0]);
-    }
-
-    {
-        multi_span<double, dynamic_range, 3, 4> s(arr, 0);
-        EXPECT_TRUE(s.length() ==  0);
-        EXPECT_TRUE(s.data() == &arr[0][0][0]);
-    }
-
-    delete[] arr;
-}
-
-TEST(multi_span_test, from_std_array_constructor)
-{
-    std::array<int, 4> arr = {1, 2, 3, 4};
-
-    {
-        multi_span<int> s{arr};
-        EXPECT_TRUE(s.size() ==  narrow_cast<ptrdiff_t>(arr.size()));
-        EXPECT_TRUE(s.data() == arr.data());
-
-        multi_span<const int> cs{arr};
-        EXPECT_TRUE(cs.size() ==  narrow_cast<ptrdiff_t>(arr.size()));
-        EXPECT_TRUE(cs.data() == arr.data());
-    }
-
-    {
-        multi_span<int, 4> s{arr};
-        EXPECT_TRUE(s.size() ==  narrow_cast<ptrdiff_t>(arr.size()));
-        EXPECT_TRUE(s.data() == arr.data());
-
-        multi_span<const int, 4> cs{arr};
-        EXPECT_TRUE(cs.size() ==  narrow_cast<ptrdiff_t>(arr.size()));
-        EXPECT_TRUE(cs.data() == arr.data());
-    }
-
-    {
-        multi_span<int, 2> s{arr};
-        EXPECT_TRUE(s.size() ==  2);
-        EXPECT_TRUE(s.data() == arr.data());
-
-        multi_span<const int, 2> cs{arr};
-        EXPECT_TRUE(cs.size() ==  2);
-        EXPECT_TRUE(cs.data() == arr.data());
-    }
-
-    {
-        multi_span<int, 0> s{arr};
-        EXPECT_TRUE(s.size() ==  0);
-        EXPECT_TRUE(s.data() == arr.data());
-
-        multi_span<const int, 0> cs{arr};
-        EXPECT_TRUE(cs.size() ==  0);
-        EXPECT_TRUE(cs.data() == arr.data());
-    }
-
-    // TODO This is currently an unsupported scenario. We will come back to it as we revise
-    // the multidimensional interface and what transformations between dimensionality look like
-    //{
-    //    multi_span<int, 2, 2> s{arr};
-    //    EXPECT_TRUE(s.size() == narrow_cast<ptrdiff_t>(arr.size()));
-    //    EXPECT_TRUE(s.data() == arr.data());
-    //}
-
-    {
-#ifdef CONFIRM_COMPILATION_ERRORS
-        multi_span<int, 5> s{arr};
-#endif
-    }
-
-    {
-#ifdef CONFIRM_COMPILATION_ERRORS
-        auto get_an_array = []() { return std::array<int, 4>{1, 2, 3, 4}; };
-        auto take_a_span = [](multi_span<int> s) { (void) s; };
-        // try to take a temporary std::array
-        take_a_span(get_an_array());
-#endif
-    }
-}
-
-TEST(multi_span_test, from_const_std_array_constructor)
-{
-    const std::array<int, 4> arr = {1, 2, 3, 4};
-
-    {
-        multi_span<const int> s{arr};
-        EXPECT_TRUE(s.size() ==  narrow_cast<ptrdiff_t>(arr.size()));
-        EXPECT_TRUE(s.data() == arr.data());
-    }
-
-    {
-        multi_span<const int, 4> s{arr};
-        EXPECT_TRUE(s.size() ==  narrow_cast<ptrdiff_t>(arr.size()));
-        EXPECT_TRUE(s.data() == arr.data());
-    }
-
-    {
-        multi_span<const int, 2> s{arr};
-        EXPECT_TRUE(s.size() ==  2);
-        EXPECT_TRUE(s.data() == arr.data());
-    }
-
-    {
-        multi_span<const int, 0> s{arr};
-        EXPECT_TRUE(s.size() ==  0);
-        EXPECT_TRUE(s.data() == arr.data());
-    }
-
-    // TODO This is currently an unsupported scenario. We will come back to it as we revise
-    // the multidimensional interface and what transformations between dimensionality look like
-    //{
-    //    multi_span<int, 2, 2> s{arr};
-    //    EXPECT_TRUE(s.size() == narrow_cast<ptrdiff_t>(arr.size()));
-    //    EXPECT_TRUE(s.data() == arr.data());
-    //}
-
-    {
-#ifdef CONFIRM_COMPILATION_ERRORS
-        multi_span<const int, 5> s{arr};
-#endif
-    }
-
-    {
-#ifdef CONFIRM_COMPILATION_ERRORS
-        auto get_an_array = []() -> const std::array<int, 4> { return {1, 2, 3, 4}; };
-        auto take_a_span = [](multi_span<const int> s) { (void) s; };
-        // try to take a temporary std::array
-        take_a_span(get_an_array());
-#endif
-    }
-}
-
-TEST(multi_span_test, from_container_constructor)
-{
-    std::vector<int> v = {1, 2, 3};
-    const std::vector<int> cv = v;
-
-    {
-        multi_span<int> s{v};
-        EXPECT_TRUE(s.size() ==  narrow_cast<std::ptrdiff_t>(v.size()));
-        EXPECT_TRUE(s.data() == v.data());
-
-        multi_span<const int> cs{v};
-        EXPECT_TRUE(cs.size() ==  narrow_cast<std::ptrdiff_t>(v.size()));
-        EXPECT_TRUE(cs.data() == v.data());
-    }
-
-    std::string str = "hello";
-    const std::string cstr = "hello";
-
-    {
-#ifdef CONFIRM_COMPILATION_ERRORS
-        multi_span<char> s{str};
-        EXPECT_TRUE(s.size() ==  narrow_cast<std::ptrdiff_t>(str.size()));
-        EXPECT_TRUE(s.data() == str.data());
-#endif
-        multi_span<const char> cs{str};
-        EXPECT_TRUE(cs.size() ==  narrow_cast<std::ptrdiff_t>(str.size()));
-        EXPECT_TRUE(cs.data() == str.data());
-    }
-
-    {
-#ifdef CONFIRM_COMPILATION_ERRORS
-        multi_span<char> s{cstr};
-#endif
-        multi_span<const char> cs{cstr};
-        EXPECT_TRUE(cs.size() ==  narrow_cast<std::ptrdiff_t>(cstr.size()));
-        EXPECT_TRUE(cs.data() == cstr.data());
-    }
-
-    {
-#ifdef CONFIRM_COMPILATION_ERRORS
-        auto get_temp_vector = []() -> std::vector<int> { return {}; };
-        auto use_span = [](multi_span<int> s) { (void) s; };
-        use_span(get_temp_vector());
-#endif
-    }
-
-    {
-#ifdef CONFIRM_COMPILATION_ERRORS
-        auto get_temp_string = []() -> std::string { return {}; };
-        auto use_span = [](multi_span<char> s) { (void) s; };
-        use_span(get_temp_string());
-#endif
-    }
-
-    {
-#ifdef CONFIRM_COMPILATION_ERRORS
-        auto get_temp_vector = []() -> const std::vector<int> { return {}; };
-        auto use_span = [](multi_span<const char> s) { (void) s; };
-        use_span(get_temp_vector());
-#endif
-    }
-
-    {
-#ifdef CONFIRM_COMPILATION_ERRORS
-        auto get_temp_string = []() -> const std::string { return {}; };
-        auto use_span = [](multi_span<const char> s) { (void) s; };
-        use_span(get_temp_string());
-#endif
-    }
-
-    {
-#ifdef CONFIRM_COMPILATION_ERRORS
-        std::map<int, int> m;
-        multi_span<int> s{m};
-#endif
-    }
-}
-
-TEST(multi_span_test, from_convertible_span_constructor)
-{
-#ifdef CONFIRM_COMPILATION_ERRORS
-    multi_span<int, 7, 4, 2> av1(nullptr, b1);
-
-    std::set_terminate([] {
-        std::cerr << "Expected Death. from_convertible_span_constructor";
-        std::abort();
-    });
-
-    auto f = [&]() { multi_span<int, 7, 4, 2> av1(nullptr); };
-    EXPECT_DEATH(f(), deathstring);
-#endif
-
-#ifdef CONFIRM_COMPILATION_ERRORS
-    static_bounds<std::size_t, 7, dynamic_range, 2> b12(b11);
-    b12 = b11;
-    b11 = b12;
-
-    multi_span<int, dynamic_range> av1 = nullptr;
-    multi_span<int, 7, dynamic_range, 2> av2(av1);
-    multi_span<int, 7, 4, 2> av2(av1);
-#endif
-
-    multi_span<DerivedClass> avd;
-#ifdef CONFIRM_COMPILATION_ERRORS
-    multi_span<BaseClass> avb = avd;
-#endif
-    multi_span<const DerivedClass> avcd = avd;
-    (void) avcd;
-}
-
-TEST(multi_span_test, copy_move_and_assignment)
-{
-    multi_span<int> s1;
-    EXPECT_TRUE(s1.empty());
-
-    int arr[] = {3, 4, 5};
-
-    multi_span<const int> s2 = arr;
-    EXPECT_TRUE(s2.length() ==  3);
-    EXPECT_TRUE(s2.data() == &arr[0]);
-
-    s2 = s1;
-    EXPECT_TRUE(s2.empty());
-
-    auto get_temp_span = [&]() -> multi_span<int> { return {&arr[1], 2}; };
-    auto use_span = [&](multi_span<const int> s) {
-        EXPECT_TRUE(s.length() ==  2);
-        EXPECT_TRUE(s.data() == &arr[1]);
-    };
-    use_span(get_temp_span());
-
-    s1 = get_temp_span();
-    EXPECT_TRUE(s1.length() ==  2);
-    EXPECT_TRUE(s1.data() == &arr[1]);
-}
-
-TEST(multi_span_test, as_multi_span_reshape)
-{
-    int a[3][4][5];
-    auto av = as_multi_span(a);
-    fn(av.bounds());
-    auto av2 = as_multi_span(av, dim<60>());
-    auto av3 = as_multi_span(av2, dim<3>(), dim<4>(), dim<5>());
-    auto av4 = as_multi_span(av3, dim<4>(), dim(3), dim<5>());
-    auto av5 = as_multi_span(av4, dim<3>(), dim<4>(), dim<5>());
-    auto av6 = as_multi_span(av5, dim<12>(), dim(5));
-
-    fill(av6.begin(), av6.end(), 1);
-
-    auto av7 = as_bytes(av6);
-
-    auto av8 = as_multi_span<int>(av7);
-
-    EXPECT_TRUE(av8.size() == av6.size());
-    for (auto i = 0; i < av8.size(); i++) { EXPECT_TRUE(av8[i] == 1); }
-}
-
-TEST(multi_span_test, first)
-{
-    int arr[5] = {1, 2, 3, 4, 5};
-
-    {
-        multi_span<int, 5> av = arr;
-        EXPECT_TRUE(av.first<2>().bounds() == static_bounds<2>());
-        EXPECT_TRUE(av.first<2>().length() == 2);
-        EXPECT_TRUE(av.first(2).length() == 2);
-    }
-
-    {
-        multi_span<int, 5> av = arr;
-        EXPECT_TRUE(av.first<0>().bounds() == static_bounds<0>());
-        EXPECT_TRUE(av.first<0>().length() == 0);
-        EXPECT_TRUE(av.first(0).length() == 0);
-    }
-
-    {
-        multi_span<int, 5> av = arr;
-        EXPECT_TRUE(av.first<5>().bounds() == static_bounds<5>());
-        EXPECT_TRUE(av.first<5>().length() == 5);
-        EXPECT_TRUE(av.first(5).length() == 5);
-    }
-
-    {
-        multi_span<int, 5> av = arr;
-#ifdef CONFIRM_COMPILATION_ERRORS
-        EXPECT_TRUE(av.first<6>().bounds() == static_bounds<6>());
-        EXPECT_TRUE(av.first<6>().length() == 6);
-        EXPECT_TRUE(av.first<-1>().length() == -1);
-#endif
-
-        std::set_terminate([] {
-            std::cerr << "Expected Death. first";
-            std::abort();
-        });
-
-        EXPECT_DEATH(av.first(6).length(), deathstring);
-    }
-
-    {
-        multi_span<int, dynamic_range> av;
-        EXPECT_TRUE(av.first<0>().bounds() == static_bounds<0>());
-        EXPECT_TRUE(av.first<0>().length() == 0);
-        EXPECT_TRUE(av.first(0).length() == 0);
-    }
-}
-
-TEST(multi_span_test, last)
-{
-    int arr[5] = {1, 2, 3, 4, 5};
-
-    {
-        multi_span<int, 5> av = arr;
-        EXPECT_TRUE(av.last<2>().bounds() == static_bounds<2>());
-        EXPECT_TRUE(av.last<2>().length() == 2);
-        EXPECT_TRUE(av.last(2).length() == 2);
-    }
-
-    {
-        multi_span<int, 5> av = arr;
-        EXPECT_TRUE(av.last<0>().bounds() == static_bounds<0>());
-        EXPECT_TRUE(av.last<0>().length() == 0);
-        EXPECT_TRUE(av.last(0).length() == 0);
-    }
-
-    {
-        multi_span<int, 5> av = arr;
-        EXPECT_TRUE(av.last<5>().bounds() == static_bounds<5>());
-        EXPECT_TRUE(av.last<5>().length() == 5);
-        EXPECT_TRUE(av.last(5).length() == 5);
-    }
-
-    {
-        multi_span<int, 5> av = arr;
-#ifdef CONFIRM_COMPILATION_ERRORS
-        EXPECT_TRUE(av.last<6>().bounds() == static_bounds<6>());
-        EXPECT_TRUE(av.last<6>().length() == 6);
-#endif
-
-        std::set_terminate([] {
-            std::cerr << "Expected Death. last";
-            std::abort();
-        });
-
-        EXPECT_DEATH(av.last(6).length(), deathstring);
-    }
-
-    {
-        multi_span<int, dynamic_range> av;
-        EXPECT_TRUE(av.last<0>().bounds() == static_bounds<0>());
-        EXPECT_TRUE(av.last<0>().length() == 0);
-        EXPECT_TRUE(av.last(0).length() == 0);
-    }
-}
-
-TEST(multi_span_test, subspan)
-{
-    int arr[5] = {1, 2, 3, 4, 5};
-
-    {
-        multi_span<int, 5> av = arr;
-        EXPECT_TRUE((av.subspan<2, 2>().bounds()) == static_bounds<2>());
-        EXPECT_TRUE((av.subspan<2, 2>().length()) == 2);
-        EXPECT_TRUE(av.subspan(2, 2).length() == 2);
-        EXPECT_TRUE(av.subspan(2, 3).length() == 3);
-    }
-
-    {
-        multi_span<int, 5> av = arr;
-        EXPECT_TRUE((av.subspan<0, 0>().bounds()) == static_bounds<0>());
-        EXPECT_TRUE((av.subspan<0, 0>().length()) == 0);
-        EXPECT_TRUE(av.subspan(0, 0).length() == 0);
-    }
-
-
-    std::set_terminate([] {
-        std::cerr << "Expected Death. subspan";
-        std::abort();
-    });
-    {
-        multi_span<int, 5> av = arr;
-        EXPECT_TRUE((av.subspan<0, 5>().bounds()) == static_bounds<5>());
-        EXPECT_TRUE((av.subspan<0, 5>().length()) == 5);
-        EXPECT_TRUE(av.subspan(0, 5).length() == 5);
-        EXPECT_DEATH(av.subspan(0, 6).length(), deathstring);
-        EXPECT_DEATH(av.subspan(1, 5).length(), deathstring);
-    }
-
-    {
-        multi_span<int, 5> av = arr;
-        EXPECT_TRUE((av.subspan<5, 0>().bounds()) == static_bounds<0>());
-        EXPECT_TRUE((av.subspan<5, 0>().length()) == 0);
-        EXPECT_TRUE(av.subspan(5, 0).length() == 0);
-        EXPECT_DEATH(av.subspan(6, 0).length(), deathstring);
-    }
-
-    {
-        multi_span<int, dynamic_range> av;
-        EXPECT_TRUE((av.subspan<0, 0>().bounds()) == static_bounds<0>());
-        EXPECT_TRUE((av.subspan<0, 0>().length()) == 0);
-        EXPECT_TRUE(av.subspan(0, 0).length() == 0);
-        EXPECT_DEATH((av.subspan<1, 0>().length()), deathstring);
-    }
-
-    {
-        multi_span<int> av;
-        EXPECT_TRUE(av.subspan(0).length() == 0);
-        EXPECT_DEATH(av.subspan(1).length(), deathstring);
-    }
-
-    {
-        multi_span<int> av = arr;
-        EXPECT_TRUE(av.subspan(0).length() == 5);
-        EXPECT_TRUE(av.subspan(1).length() == 4);
-        EXPECT_TRUE(av.subspan(4).length() == 1);
-        EXPECT_TRUE(av.subspan(5).length() == 0);
-        // Disabled test instead of fixing since multi_span is deprecated. (PR#835)
-#if !(defined(__GNUC__) && __GNUC__ == 8)
-        EXPECT_DEATH(av.subspan(6).length(), deathstring);
-#endif
-        auto av2 = av.subspan(1);
-        for (int i = 0; i < 4; ++i) EXPECT_TRUE(av2[i] == i + 2);
-    }
-
-    {
-        multi_span<int, 5> av = arr;
-        EXPECT_TRUE(av.subspan(0).length() == 5);
-        EXPECT_TRUE(av.subspan(1).length() == 4);
-        EXPECT_TRUE(av.subspan(4).length() == 1);
-        EXPECT_TRUE(av.subspan(5).length() == 0);
-        EXPECT_DEATH(av.subspan(6).length(), deathstring);
-        auto av2 = av.subspan(1);
-        for (int i = 0; i < 4; ++i) EXPECT_TRUE(av2[i] == i + 2);
-    }
-}
-
-TEST(multi_span_test, rank)
-{
-    int arr[2] = {1, 2};
-
-    {
-        multi_span<int> s;
-        EXPECT_TRUE(s.rank() == static_cast<size_t>(1));
-    }
-
-    {
-        multi_span<int, 2> s = arr;
-        EXPECT_TRUE(s.rank() == static_cast<size_t>(1));
-    }
-
-    int arr2d[1][1] = {};
-    {
-        multi_span<int, 1, 1> s = arr2d;
-        EXPECT_TRUE(s.rank() == static_cast<size_t>(2));
-    }
-}
-
-TEST(multi_span_test, extent)
-{
-    std::set_terminate([] {
-        std::cerr << "Expected Death. extent";
-        std::abort();
-    });
-
-    {
-        multi_span<int> s;
-        EXPECT_TRUE(s.extent() == 0);
-        EXPECT_TRUE(s.extent(0) == 0);
-        EXPECT_DEATH(s.extent(1), deathstring);
-#ifdef CONFIRM_COMPILATION_ERRORS
-        EXPECT_TRUE(s.extent<1>() == 0);
-#endif
-    }
-
-    {
-        multi_span<int, 0> s;
-        EXPECT_TRUE(s.extent() == 0);
-        EXPECT_TRUE(s.extent(0) == 0);
-        EXPECT_DEATH(s.extent(1), deathstring);
-    }
-
-    {
-        int arr2d[1][2] = {};
-
-        multi_span<int, 1, 2> s = arr2d;
-        EXPECT_TRUE(s.extent() == 1);
-        EXPECT_TRUE(s.extent<0>() == 1);
-        EXPECT_TRUE(s.extent<1>() == 2);
-        EXPECT_TRUE(s.extent(0) == 1);
-        EXPECT_TRUE(s.extent(1) == 2);
-        EXPECT_DEATH(s.extent(3), deathstring);
-    }
-
-    {
-        int arr2d[1][2] = {};
-
-        multi_span<int, 0, 2> s = arr2d;
-        EXPECT_TRUE(s.extent() == 0);
-        EXPECT_TRUE(s.extent<0>() == 0);
-        EXPECT_TRUE(s.extent<1>() == 2);
-        EXPECT_TRUE(s.extent(0) == 0);
-        EXPECT_TRUE(s.extent(1) == 2);
-        EXPECT_DEATH(s.extent(3), deathstring);
-    }
-}
-
-TEST(multi_span_test, operator_function_call)
-{
-    int arr[4] = {1, 2, 3, 4};
-
-    std::set_terminate([] {
-        std::cerr << "Expected Death. operator_function_call";
-        std::abort();
-    });
-
-    {
-        multi_span<int> s = arr;
-        EXPECT_TRUE(s(0) == 1);
-        EXPECT_DEATH(s(5), deathstring);
-    }
-
-    int arr2d[2][3] = {1, 2, 3, 4, 5, 6};
-
-    {
-        multi_span<int, 2, 3> s = arr2d;
-        EXPECT_TRUE(s(0, 0) == 1);
-        EXPECT_TRUE(s(0, 1) == 2);
-        EXPECT_TRUE(s(1, 2) == 6);
-    }
-
-    int arr3d[2][2][2] = {1, 2, 3, 4, 5, 6, 7, 8};
-
-    {
-        multi_span<int, 2, 2, 2> s = arr3d;
-        EXPECT_TRUE(s(0, 0, 0) == 1);
-        EXPECT_TRUE(s(1, 1, 1) == 8);
-    }
-}
-
-TEST(multi_span_test, comparison_operators)
-{
-    {
-        int arr[10][2];
-        auto s1 = as_multi_span(arr);
-        multi_span<const int, dynamic_range, 2> s2 = s1;
-
-        EXPECT_TRUE(s1 == s2);
-
-        multi_span<int, 20> s3 = as_multi_span(s1, dim(20));
-        EXPECT_TRUE(s3 == s2);
-        EXPECT_TRUE(s3 == s1);
-    }
-    {
-        multi_span<int> s1 = nullptr;
-        multi_span<int> s2 = nullptr;
-        EXPECT_TRUE(s1 == s2);
-        EXPECT_FALSE(s1 != s2);
-        EXPECT_FALSE(s1 < s2);
-        EXPECT_TRUE(s1 <= s2);
-        EXPECT_FALSE(s1 > s2);
-        EXPECT_TRUE(s1 >= s2);
-        EXPECT_TRUE(s2 == s1);
-        EXPECT_FALSE(s2 != s1);
-        EXPECT_FALSE(s2 < s1);
-        EXPECT_TRUE(s2 <= s1);
-        EXPECT_FALSE(s2 > s1);
-        EXPECT_TRUE(s2 >= s1);
-    }
-
-
-    {
-        int arr[] = {2, 1}; // bigger
-
-        multi_span<int> s1 = nullptr;
-        multi_span<int> s2 = arr;
-
-        EXPECT_TRUE(s1 != s2);
-        EXPECT_TRUE(s2 != s1);
-        EXPECT_FALSE(s1 == s2);
-        EXPECT_FALSE(s2 == s1);
-        EXPECT_TRUE(s1 < s2);
-        EXPECT_FALSE(s2 < s1);
-        EXPECT_TRUE(s1 <= s2);
-        EXPECT_FALSE(s2 <= s1);
-        EXPECT_TRUE(s2 > s1);
-        EXPECT_FALSE(s1 > s2);
-        EXPECT_TRUE(s2 >= s1);
-        EXPECT_FALSE(s1 >= s2);
-    }
-
-    {
-        int arr1[] = {1, 2};
-        int arr2[] = {1, 2};
-        multi_span<int> s1 = arr1;
-        multi_span<int> s2 = arr2;
-
-        EXPECT_TRUE(s1 == s2);
-        EXPECT_FALSE(s1 != s2);
-        EXPECT_FALSE(s1 < s2);
-        EXPECT_TRUE(s1 <= s2);
-        EXPECT_FALSE(s1 > s2);
-        EXPECT_TRUE(s1 >= s2);
-        EXPECT_TRUE(s2 == s1);
-        EXPECT_FALSE(s2 != s1);
-        EXPECT_FALSE(s2 < s1);
-        EXPECT_TRUE(s2 <= s1);
-        EXPECT_FALSE(s2 > s1);
-        EXPECT_TRUE(s2 >= s1);
-    }
-
-    {
-        int arr[] = {1, 2, 3};
-
-        multi_span<int> s1 = {&arr[0], 2}; // shorter
-        multi_span<int> s2 = arr;          // longer
-
-        EXPECT_TRUE(s1 != s2);
-        EXPECT_TRUE(s2 != s1);
-        EXPECT_FALSE(s1 == s2);
-        EXPECT_FALSE(s2 == s1);
-        EXPECT_TRUE(s1 < s2);
-        EXPECT_FALSE(s2 < s1);
-        EXPECT_TRUE(s1 <= s2);
-        EXPECT_FALSE(s2 <= s1);
-        EXPECT_TRUE(s2 > s1);
-        EXPECT_FALSE(s1 > s2);
-        EXPECT_TRUE(s2 >= s1);
-        EXPECT_FALSE(s1 >= s2);
-    }
-
-    {
-        int arr1[] = {1, 2}; // smaller
-        int arr2[] = {2, 1}; // bigger
-
-        multi_span<int> s1 = arr1;
-        multi_span<int> s2 = arr2;
-
-        EXPECT_TRUE(s1 != s2);
-        EXPECT_TRUE(s2 != s1);
-        EXPECT_FALSE(s1 == s2);
-        EXPECT_FALSE(s2 == s1);
-        EXPECT_TRUE(s1 < s2);
-        EXPECT_FALSE(s2 < s1);
-        EXPECT_TRUE(s1 <= s2);
-        EXPECT_FALSE(s2 <= s1);
-        EXPECT_TRUE(s2 > s1);
-        EXPECT_FALSE(s1 > s2);
-        EXPECT_TRUE(s2 >= s1);
-        EXPECT_FALSE(s1 >= s2);
-    }
-}
-
-TEST(multi_span_test, basics)
-{
-    auto ptr = as_multi_span(new int[10], 10);
-    fill(ptr.begin(), ptr.end(), 99);
-    for (int num : ptr) { EXPECT_TRUE(num == 99); }
-
-    delete[] ptr.data();
-}
-
-TEST(multi_span_test, bounds_checks)
-{
-    int arr[10][2];
-    auto av = as_multi_span(arr);
-
-    fill(begin(av), end(av), 0);
-
-    av[2][0] = 1;
-    av[1][1] = 3;
-
-    std::set_terminate([] {
-        std::cerr << "Expected Death. bounds_check";
-        std::abort();
-    });
-
-    // out of bounds
-    EXPECT_DEATH(av[1][3] = 3, deathstring);
-    EXPECT_DEATH((av[{1, 3}] = 3), deathstring);
-
-    EXPECT_DEATH(av[10][2], deathstring);
-    EXPECT_DEATH((av[{10, 2}]), deathstring);
-
-    EXPECT_DEATH(av[-1][0], deathstring);
-    EXPECT_DEATH((av[{-1, 0}]), deathstring);
-
-    EXPECT_DEATH(av[0][-1], deathstring);
-    EXPECT_DEATH((av[{0, -1}]), deathstring);
-}
-
-TEST(multi_span_test, span_parameter_test)
-{
-    auto data = new int[4][3][5];
-
-    auto av = as_multi_span(data, 4);
-
-    EXPECT_TRUE(av.size() == 60);
-
-    fill(av.begin(), av.end(), 34);
-
-    int count = 0;
-    for_each(av.rbegin(), av.rend(), [&](int val) { count += val; });
-    EXPECT_TRUE(count == 34 * 60);
-    overloaded_func(av, 34);
-
-    overloaded_func(as_multi_span(av, dim(4), dim(3), dim(5)), 34);
-
-    delete[] data;
-}
-
-TEST(multi_span_test, md_access)
-{
-    auto width = 5, height = 20;
-
-    auto imgSize = width * height;
-    auto image_ptr = new int[narrow_cast<std::size_t>(imgSize)][3];
-
-    // size check will be done
-    auto image_view =
-        as_multi_span(as_multi_span(image_ptr, imgSize), dim(height), dim(width), dim<3>());
-
-    iota(image_view.begin(), image_view.end(), 1);
-
-    int expected = 0;
-    for (auto i = 0; i < height; i++)
-    {
-        for (auto j = 0; j < width; j++)
-        {
-            EXPECT_TRUE(expected + 1 == image_view[i][j][0]);
-            EXPECT_TRUE(expected + 2 == image_view[i][j][1]);
-            EXPECT_TRUE(expected + 3 == image_view[i][j][2]);
-
-            auto val = image_view[{i, j, 0}];
-            EXPECT_TRUE(expected + 1 == val);
-            val = image_view[{i, j, 1}];
-            EXPECT_TRUE(expected + 2 == val);
-            val = image_view[{i, j, 2}];
-            EXPECT_TRUE(expected + 3 == val);
-
-            expected += 3;
-        }
-    }
-
-    delete[] image_ptr;
-}
-
-TEST(multi_span_test, as_multi_span)
-{
-    {
-        int* arr = new int[150];
-
-        auto av = as_multi_span(arr, dim<10>(), dim(3), dim<5>());
-
-        fill(av.begin(), av.end(), 24);
-        overloaded_func(av, 24);
-
-        delete[] arr;
-
-        array<int, 15> stdarr{0};
-        auto av2 = as_multi_span(stdarr);
-        overloaded_func(as_multi_span(av2, dim(1), dim<3>(), dim<5>()), 0);
-
-        string str = "ttttttttttttttt"; // size = 15
-        auto t = str.data();
-        GSL_SUPPRESS(type.4) // NO-FORMAT: attribute // TODO: false positive
-        (void) t;
-        auto av3 = as_multi_span(str);
-        overloaded_func(as_multi_span(av3, dim(1), dim<3>(), dim<5>()), 't');
-    }
-
-    {
-        string str;
-        multi_span<char> strspan = as_multi_span(str);
-        (void) strspan;
-        const string cstr;
-        multi_span<const char> cstrspan = as_multi_span(cstr);
-        (void) cstrspan;
-    }
-
-    {
-        int a[3][4][5];
-        auto av = as_multi_span(a);
-        const int(*b)[4][5];
-        b = a;
-        auto bv = as_multi_span(b, 3);
-
-        EXPECT_TRUE(av == bv);
-
-        const std::array<double, 3> arr = {0.0, 0.0, 0.0};
-        auto cv = as_multi_span(arr);
-        (void) cv;
-
-        vector<float> vec(3);
-        auto dv = as_multi_span(vec);
-        (void) dv;
-
-    #ifdef CONFIRM_COMPILATION_ERRORS
-        auto dv2 = as_multi_span(std::move(vec));
-    #endif
-
-    }
-}
-
-TEST(multi_span_test, empty_spans)
-{
-    std::set_terminate([] {
-        std::cerr << "Expected Death. empty_spans";
-        std::abort();
-    });
-
-    {
-        multi_span<int, 0> empty_av(nullptr);
-
-        EXPECT_TRUE(empty_av.bounds().index_bounds() == multi_span_index<1>{0});
-        EXPECT_DEATH(empty_av[0], deathstring);
-        EXPECT_DEATH(empty_av.begin()[0], deathstring);
-        EXPECT_DEATH(empty_av.cbegin()[0], deathstring);
-        for (auto& v : empty_av)
-        {
-            (void) v;
-            EXPECT_TRUE(false);
-        }
-    }
-
-    {
-        multi_span<int> empty_av = {};
-        EXPECT_TRUE(empty_av.bounds().index_bounds() == multi_span_index<1>{0});
-        EXPECT_DEATH(empty_av[0], deathstring);
-        EXPECT_DEATH(empty_av.begin()[0], deathstring);
-        EXPECT_DEATH(empty_av.cbegin()[0], deathstring);
-        for (auto& v : empty_av)
-        {
-            (void) v;
-            EXPECT_TRUE(false);
-        }
-    }
-}
-
-TEST(multi_span_test, index_constructor)
-{
-    auto arr = new int[8];
-    for (int i = 0; i < 4; ++i)
-    {
-        arr[2 * i] = 4 + i;
-        arr[2 * i + 1] = i;
-    }
-
-    multi_span<int, dynamic_range> av(arr, 8);
-
-    ptrdiff_t a[1] = {0};
-    multi_span_index<1> i = a;
-
-    EXPECT_TRUE(av[i] == 4);
-
-    auto av2 = as_multi_span(av, dim<4>(), dim(2));
-    ptrdiff_t a2[2] = {0, 1};
-    multi_span_index<2> i2 = a2;
-
-    EXPECT_TRUE(av2[i2] == 0);
-    EXPECT_TRUE(av2[0][i] == 4);
-
-    delete[] arr;
-}
-
-TEST(multi_span_test, index_constructors)
-{
-    {
-        // components of the same type
-        multi_span_index<3> i1(0, 1, 2);
-        EXPECT_TRUE(i1[0] == 0);
-
-        // components of different types
-        std::size_t c0 = 0;
-        std::size_t c1 = 1;
-        multi_span_index<3> i2(c0, c1, 2);
-        EXPECT_TRUE(i2[0] == 0);
-
-        // from array
-        multi_span_index<3> i3 = {0, 1, 2};
-        EXPECT_TRUE(i3[0] == 0);
-
-        // from other index of the same size type
-        multi_span_index<3> i4 = i3;
-        EXPECT_TRUE(i4[0] == 0);
-
-        // default
-        multi_span_index<3> i7;
-        EXPECT_TRUE(i7[0] == 0);
-
-        // default
-        multi_span_index<3> i9 = {};
-        EXPECT_TRUE(i9[0] == 0);
-    }
-
-    {
-        // components of the same type
-        multi_span_index<1> i1(0);
-        EXPECT_TRUE(i1[0] == 0);
-
-        // components of different types
-        std::size_t c0 = 0;
-        multi_span_index<1> i2(c0);
-        EXPECT_TRUE(i2[0] == 0);
-
-        // from array
-        multi_span_index<1> i3 = {0};
-        EXPECT_TRUE(i3[0] == 0);
-
-        // from int
-        multi_span_index<1> i4 = 0;
-        EXPECT_TRUE(i4[0] == 0);
-
-        // from other index of the same size type
-        multi_span_index<1> i5 = i3;
-        EXPECT_TRUE(i5[0] == 0);
-
-        // default
-        multi_span_index<1> i8;
-        EXPECT_TRUE(i8[0] == 0);
-
-        // default
-        multi_span_index<1> i9 = {};
-        EXPECT_TRUE(i9[0] == 0);
-    }
-
-#ifdef CONFIRM_COMPILATION_ERRORS
-    {
-        multi_span_index<3> i1(0, 1);
-        multi_span_index<3> i2(0, 1, 2, 3);
-        multi_span_index<3> i3 = {0};
-        multi_span_index<3> i4 = {0, 1, 2, 3};
-        multi_span_index<1> i5 = {0, 1};
-    }
-#endif
-}
-
-TEST(multi_span_test, index_operations)
-{
-    ptrdiff_t a[3] = {0, 1, 2};
-    ptrdiff_t b[3] = {3, 4, 5};
-    multi_span_index<3> i = a;
-    multi_span_index<3> j = b;
-
-    EXPECT_TRUE(i[0] == 0);
-    EXPECT_TRUE(i[1] == 1);
-    EXPECT_TRUE(i[2] == 2);
-
-    {
-        multi_span_index<3> k = i + j;
-
-        EXPECT_TRUE(i[0] == 0);
-        EXPECT_TRUE(i[1] == 1);
-        EXPECT_TRUE(i[2] == 2);
-        EXPECT_TRUE(k[0] == 3);
-        EXPECT_TRUE(k[1] == 5);
-        EXPECT_TRUE(k[2] == 7);
-    }
-
-    {
-        multi_span_index<3> k = i * 3;
-
-        EXPECT_TRUE(i[0] == 0);
-        EXPECT_TRUE(i[1] == 1);
-        EXPECT_TRUE(i[2] == 2);
-        EXPECT_TRUE(k[0] == 0);
-        EXPECT_TRUE(k[1] == 3);
-        EXPECT_TRUE(k[2] == 6);
-    }
-
-    {
-        multi_span_index<3> k = 3 * i;
-
-        EXPECT_TRUE(i[0] == 0);
-        EXPECT_TRUE(i[1] == 1);
-        EXPECT_TRUE(i[2] == 2);
-        EXPECT_TRUE(k[0] == 0);
-        EXPECT_TRUE(k[1] == 3);
-        EXPECT_TRUE(k[2] == 6);
-    }
-
-    {
-        multi_span_index<2> k = details::shift_left(i);
-
-        EXPECT_TRUE(i[0] == 0);
-        EXPECT_TRUE(i[1] == 1);
-        EXPECT_TRUE(i[2] == 2);
-        EXPECT_TRUE(k[0] == 1);
-        EXPECT_TRUE(k[1] == 2);
-    }
-}
-
-TEST(multi_span_test, span_section_iteration)
-{
-    int arr[4][2] = {{4, 0}, {5, 1}, {6, 2}, {7, 3}};
-
-    // static bounds
-    {
-        multi_span<int, 4, 2> av = arr;
-        iterate_second_column(av);
-    }
-    // first bound is dynamic
-    {
-        multi_span<int, dynamic_range, 2> av = arr;
-        iterate_second_column(av);
-    }
-    // second bound is dynamic
-    {
-        multi_span<int, 4, dynamic_range> av = arr;
-        iterate_second_column(av);
-    }
-    // both bounds are dynamic
-    {
-        multi_span<int, dynamic_range, dynamic_range> av = arr;
-        iterate_second_column(av);
-    }
-}
-
-TEST(multi_span_test, dynamic_span_section_iteration)
-{
-    auto height = 4, width = 2;
-    auto size = height * width;
-
-    auto arr = new int[narrow_cast<std::size_t>(size)];
-    for (auto i = 0; i < size; ++i) { arr[i] = i; }
-
-    auto av = as_multi_span(arr, size);
-
-    // first bound is dynamic
-    {
-        multi_span<int, dynamic_range, 2> av2 = as_multi_span(av, dim(height), dim(width));
-        iterate_second_column(av2);
-    }
-    // second bound is dynamic
-    {
-        multi_span<int, 4, dynamic_range> av2 = as_multi_span(av, dim(height), dim(width));
-        iterate_second_column(av2);
-    }
-    // both bounds are dynamic
-    {
-        multi_span<int, dynamic_range, dynamic_range> av2 =
-            as_multi_span(av, dim(height), dim(width));
-        iterate_second_column(av2);
-    }
-
-    delete[] arr;
-}
-
-TEST(multi_span_test, span_structure_size)
-{
-    double(*arr)[3][4] = new double[100][3][4];
-    multi_span<double, dynamic_range, 3, 4> av1(arr, 10);
-
-    struct EffectiveStructure
-    {
-        double* v1;
-        ptrdiff_t v2;
-    };
-    EXPECT_TRUE(sizeof(av1) == sizeof(EffectiveStructure));
-
-    std::set_terminate([] {
-        std::cerr << "Expected Death. span_structure_size";
-        std::abort();
-    });
-
-    EXPECT_DEATH(av1[10][3][4], deathstring);
-
-    multi_span<const double, dynamic_range, 6, 4> av2 =
-        as_multi_span(av1, dim(5), dim<6>(), dim<4>());
-    (void) av2;
-
-    delete[] arr;
-}
-
-TEST(multi_span_test, fixed_size_conversions)
-{
-    int arr[] = {1, 2, 3, 4};
-
-    // converting to an multi_span from an equal size array is ok
-    multi_span<int, 4> av4 = arr;
-    EXPECT_TRUE(av4.length() == 4);
-
-    // converting to dynamic_range a_v is always ok
-    {
-        multi_span<int, dynamic_range> av = av4;
-        (void) av;
-    }
-    {
-        multi_span<int, dynamic_range> av = arr;
-        (void) av;
-    }
-
-// initialization or assignment to static multi_span that REDUCES size is NOT ok
-#ifdef CONFIRM_COMPILATION_ERRORS
-    {
-        multi_span<int, 2> av2 = arr;
-    }
-    {
-        multi_span<int, 2> av2 = av4;
-    }
-#endif
-
-    {
-        multi_span<int, dynamic_range> av = arr;
-        multi_span<int, 2> av2 = av;
-        (void) av2;
-    }
-
-#ifdef CONFIRM_COMPILATION_ERRORS
-    {
-        multi_span<int, dynamic_range> av = arr;
-        multi_span<int, 2, 1> av2 = av.as_multi_span(dim<2>(), dim<2>());
-    }
-#endif
-
-    {
-        multi_span<int, dynamic_range> av = arr;
-        multi_span<int, 2, 1> av2 = as_multi_span(av, dim(2), dim(2));
-        auto workaround_macro = [&]() { return av2[{1, 0}] == 2; };
-        EXPECT_TRUE(workaround_macro());
-    }
-
-    // but doing so explicitly is ok
-
-    // you can convert statically
-    {
-        multi_span<int, 2> av2 = {arr, 2};
-        (void) av2;
-    }
-    {
-        multi_span<int, 1> av2 = av4.first<1>();
-        (void) av2;
-    }
-
-    // ...or dynamically
-    {
-        // NB: implicit conversion to multi_span<int,2> from multi_span<int,dynamic_range>
-        multi_span<int, 1> av2 = av4.first(1);
-        (void) av2;
-    }
-
-    // initialization or assignment to static multi_span that requires size INCREASE is not ok.
-    int arr2[2] = {1, 2};
-
-#ifdef CONFIRM_COMPILATION_ERRORS
-    {
-        multi_span<int, 4> av4 = arr2;
-    }
-    {
-        multi_span<int, 2> av2 = arr2;
-        multi_span<int, 4> av4 = av2;
-    }
-#endif
-
-    std::set_terminate([] {
-        std::cerr << "Expected Death. fixed_size_conversions";
-        std::abort();
-    });
-
-    {
-        auto f = [&]() {
-            const multi_span<int, 4> av9 = {arr2, 2};
-            (void) av9;
-        };
-        EXPECT_DEATH(f(), deathstring);
-    }
-
-    // this should fail - we are trying to assign a small dynamic a_v to a fixed_size larger one
-    multi_span<int, dynamic_range> av = arr2;
-    auto f = [&]() {
-        const multi_span<int, 4> av2 = av;
-        (void) av2;
-    };
-    EXPECT_DEATH(f(), deathstring);
-}
-
-TEST(multi_span_test, as_writeable_bytes)
-{
-    int a[] = {1, 2, 3, 4};
-
-    {
-#ifdef CONFIRM_COMPILATION_ERRORS
-        // you should not be able to get writeable bytes for const objects
-        multi_span<const int, dynamic_range> av = a;
-        auto wav = av.as_writeable_bytes();
-#endif
-    }
-
-    {
-        multi_span<int, dynamic_range> av;
-        auto wav = as_writeable_bytes(av);
-        EXPECT_TRUE(wav.length() == av.length());
-        EXPECT_TRUE(wav.length() == 0);
-        EXPECT_TRUE(wav.size_bytes() == 0);
-    }
-
-    {
-        multi_span<int, dynamic_range> av = a;
-        auto wav = as_writeable_bytes(av);
-        EXPECT_TRUE(wav.data() == reinterpret_cast<byte*>(&a[0]));
-        EXPECT_TRUE(static_cast<std::size_t>(wav.length()) == sizeof(a));
-    }
-}
-
-TEST(multi_span_test, iterator)
-{
-    int a[] = {1, 2, 3, 4};
-
-    {
-        multi_span<int, dynamic_range> av = a;
-        auto wav = as_writeable_bytes(av);
-        for (auto& b : wav) {
-#if defined(__cplusplus) && (__cplusplus >= 201703L)
-            b = byte{0};
-#else
-            GSL_SUPPRESS(es.49)
-            b = byte(0);
-#endif
-        }
-
-        for (std::size_t i = 0; i < 4; ++i) {
-            EXPECT_TRUE(a[i] == 0);
-        }
-    }
-
-    {
-        multi_span<int, dynamic_range> av = a;
-        for (auto& n : av) {
-            n = 1;
-        }
-        for (std::size_t i = 0; i < 4; ++i) {
-            EXPECT_TRUE(a[i] == 1);
-        }
-    }
-}
-
-#ifdef CONFIRM_COMPILATION_ERRORS
-copy(src_span_static, dst_span_static);
-#endif
diff --git a/tests/strided_span_tests.cpp b/tests/strided_span_tests.cpp
deleted file mode 100644
index 67b23eb..0000000
--- a/tests/strided_span_tests.cpp
+++ /dev/null
@@ -1,790 +0,0 @@
-///////////////////////////////////////////////////////////////////////////////
-//
-// Copyright (c) 2015 Microsoft Corporation. All rights reserved.
-//
-// This code is licensed under the MIT License (MIT).
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-//
-///////////////////////////////////////////////////////////////////////////////
-
-#include <gtest/gtest.h>
-#include <gsl/byte>   // for byte
-#include <gsl/util>   // for narrow_cast
-#include <gsl/multi_span> // for strided_span, index, multi_span, strided_...
-
-#include <iostream>    // for size_t
-#include <iterator>    // for begin, end
-#include <numeric>     // for iota
-#include <type_traits> // for integral_constant<>::value, is_convertible
-#include <vector>      // for vector
-
-using namespace std;
-using namespace gsl;
-
-
-namespace
-{
-static constexpr char deathstring[] = "Expected Death";
-
-struct BaseClass
-{
-};
-struct DerivedClass : BaseClass
-{
-};
-
-GSL_SUPPRESS(con.4) // NO-FORMAT: attribute
-GSL_SUPPRESS(bounds.1) // NO-FORMAT: attribute
-void iterate_every_other_element(multi_span<int, dynamic_range> av)
-{
-    // pick every other element
-
-    auto length = av.size() / 2;
-#if defined(_MSC_VER) && _MSC_VER > 1800
-    auto bounds = strided_bounds<1>({length}, {2});
-#else
-    auto bounds = strided_bounds<1>(multi_span_index<1>{length}, multi_span_index<1>{2});
-#endif
-    strided_span<int, 1> strided(&av.data()[1], av.size() - 1, bounds);
-
-    EXPECT_TRUE(strided.size() == length);
-    EXPECT_TRUE(strided.bounds().index_bounds()[0] == length);
-    for (auto i = 0; i < strided.size(); ++i) {
-        EXPECT_TRUE(strided[i] == av[2 * i + 1]);
-    }
-
-    int idx = 0;
-    for (auto num : strided) {
-        EXPECT_TRUE(num == av[2 * idx + 1]);
-        idx++;
-    }
-}
-
-GSL_SUPPRESS(con.4) // NO-FORMAT: attribute
-GSL_SUPPRESS(bounds.4) // NO-FORMAT: attribute
-GSL_SUPPRESS(bounds.2) // NO-FORMAT: attribute // TODO: does not work
-void iterate_second_slice(multi_span<int, dynamic_range, dynamic_range, dynamic_range> av)
-{
-    const int expected[6] = {2, 3, 10, 11, 18, 19};
-    auto section = av.section({0, 1, 0}, {3, 1, 2});
-
-    for (auto i = 0; i < section.extent<0>(); ++i) {
-        for (auto j = 0; j < section.extent<1>(); ++j)
-            for (auto k = 0; k < section.extent<2>(); ++k) {
-                auto idx = multi_span_index<3>{i, j, k}; // avoid braces in the EXPECT_TRUE macro
-                EXPECT_TRUE(section[idx] == expected[2 * i + 2 * j + k]);
-            }
-    }
-
-    for (auto i = 0; i < section.extent<0>(); ++i) {
-        for (auto j = 0; j < section.extent<1>(); ++j)
-            for (auto k = 0; k < section.extent<2>(); ++k)
-                EXPECT_TRUE(section[i][j][k] == expected[2 * i + 2 * j + k]);
-    }
-
-    int i = 0;
-    for (const auto num : section) {
-        EXPECT_TRUE(num == expected[i]);
-        i++;
-    }
-}
-
-}
-
-TEST(strided_span_tests, span_section_test)
-{
-    int a[30][4][5];
-
-    const auto av = as_multi_span(a);
-    const auto sub = av.section({15, 0, 0}, gsl::multi_span_index<3>{2, 2, 2});
-    const auto subsub = sub.section({1, 0, 0}, gsl::multi_span_index<3>{1, 1, 1});
-    (void) subsub;
-}
-
-TEST(strided_span_tests, span_section)
-{
-    std::vector<int> data(5 * 10);
-    std::iota(begin(data), end(data), 0);
-    const multi_span<int, 5, 10> av = as_multi_span(multi_span<int>{data}, dim<5>(), dim<10>());
-
-    const strided_span<int, 2> av_section_1 = av.section({1, 2}, {3, 4});
-    EXPECT_TRUE(!av_section_1.empty());
-    EXPECT_TRUE((av_section_1[{0, 0}] == 12));
-    EXPECT_TRUE((av_section_1[{0, 1}] == 13));
-    EXPECT_TRUE((av_section_1[{1, 0}] == 22));
-    EXPECT_TRUE((av_section_1[{2, 3}] == 35));
-
-    const strided_span<int, 2> av_section_2 = av_section_1.section({1, 2}, {2, 2});
-    EXPECT_TRUE(!av_section_2.empty());
-    EXPECT_TRUE((av_section_2[{0, 0}] == 24));
-    EXPECT_TRUE((av_section_2[{0, 1}] == 25));
-    EXPECT_TRUE((av_section_2[{1, 0}] == 34));
-}
-
-TEST(strided_span_tests, strided_span_constructors)
-{
-    // EXPECT_TRUE stride constructor
-    {
-        int arr[] = {1, 2, 3, 4, 5, 6, 7, 8, 9};
-        const int carr[] = {1, 2, 3, 4, 5, 6, 7, 8, 9};
-
-        strided_span<int, 1> sav1{arr, {{9}, {1}}}; // T -> T
-        EXPECT_TRUE(sav1.bounds().index_bounds() == multi_span_index<1>{9});
-        EXPECT_TRUE(sav1.bounds().stride() == 1);
-        EXPECT_TRUE(sav1[0] == 1);
-        EXPECT_TRUE(sav1[8] == 9);
-
-        strided_span<const int, 1> sav2{carr, {{4}, {2}}}; // const T -> const T
-        EXPECT_TRUE(sav2.bounds().index_bounds() == multi_span_index<1>{4});
-        EXPECT_TRUE(sav2.bounds().strides() == multi_span_index<1>{2});
-        EXPECT_TRUE(sav2[0] == 1);
-        EXPECT_TRUE(sav2[3] == 7);
-
-        strided_span<int, 2> sav3{arr, {{2, 2}, {6, 2}}}; // T -> const T
-        EXPECT_TRUE((sav3.bounds().index_bounds() == multi_span_index<2>{2, 2}));
-        EXPECT_TRUE((sav3.bounds().strides() == multi_span_index<2>{6, 2}));
-        EXPECT_TRUE((sav3[{0, 0}]) == 1);
-        EXPECT_TRUE((sav3[{0, 1}]) ==  3);
-        EXPECT_TRUE((sav3[{1, 0}]) == 7);
-    }
-
-    // EXPECT_TRUE multi_span constructor
-    {
-        int arr[] = {1, 2};
-
-        // From non-cv-qualified source
-        {
-            const multi_span<int> src = arr;
-
-            strided_span<int, 1> sav{src, {2, 1}};
-            EXPECT_TRUE(sav.bounds().index_bounds() == multi_span_index<1>{2});
-            EXPECT_TRUE(sav.bounds().strides() == multi_span_index<1>{1});
-            EXPECT_TRUE(sav[1] == 2);
-
-#if defined(_MSC_VER) && _MSC_VER > 1800
-            // strided_span<const int, 1> sav_c{ {src}, {2, 1} };
-            strided_span<const int, 1> sav_c{multi_span<const int>{src},
-                                             strided_bounds<1>{2, 1}};
-#else
-            strided_span<const int, 1> sav_c{multi_span<const int>{src},
-                                             strided_bounds<1>{2, 1}};
-#endif
-            EXPECT_TRUE(sav_c.bounds().index_bounds() == multi_span_index<1>{2});
-            EXPECT_TRUE(sav_c.bounds().strides() == multi_span_index<1>{1});
-            EXPECT_TRUE(sav_c[1] == 2);
-
-#if defined(_MSC_VER) && _MSC_VER > 1800
-            strided_span<volatile int, 1> sav_v{src, {2, 1}};
-#else
-            strided_span<volatile int, 1> sav_v{multi_span<volatile int>{src},
-                                                strided_bounds<1>{2, 1}};
-#endif
-            EXPECT_TRUE(sav_v.bounds().index_bounds() == multi_span_index<1>{2});
-            EXPECT_TRUE(sav_v.bounds().strides() == multi_span_index<1>{1});
-            EXPECT_TRUE(sav_v[1] == 2);
-
-#if defined(_MSC_VER) && _MSC_VER > 1800
-            strided_span<const volatile int, 1> sav_cv{src, {2, 1}};
-#else
-            strided_span<const volatile int, 1> sav_cv{multi_span<const volatile int>{src},
-                                                       strided_bounds<1>{2, 1}};
-#endif
-            EXPECT_TRUE(sav_cv.bounds().index_bounds() == multi_span_index<1>{2});
-            EXPECT_TRUE(sav_cv.bounds().strides() == multi_span_index<1>{1});
-            EXPECT_TRUE(sav_cv[1] == 2);
-        }
-
-        // From const-qualified source
-        {
-            const multi_span<const int> src{arr};
-
-            strided_span<const int, 1> sav_c{src, {2, 1}};
-            EXPECT_TRUE(sav_c.bounds().index_bounds() == multi_span_index<1>{2});
-            EXPECT_TRUE(sav_c.bounds().strides() == multi_span_index<1>{1});
-            EXPECT_TRUE(sav_c[1] == 2);
-
-#if defined(_MSC_VER) && _MSC_VER > 1800
-            strided_span<const volatile int, 1> sav_cv{src, {2, 1}};
-#else
-            strided_span<const volatile int, 1> sav_cv{multi_span<const volatile int>{src},
-                                                       strided_bounds<1>{2, 1}};
-#endif
-
-            EXPECT_TRUE(sav_cv.bounds().index_bounds() == multi_span_index<1>{2});
-            EXPECT_TRUE(sav_cv.bounds().strides() == multi_span_index<1>{1});
-            EXPECT_TRUE(sav_cv[1] == 2);
-        }
-
-        // From volatile-qualified source
-        {
-            const multi_span<volatile int> src{arr};
-
-            strided_span<volatile int, 1> sav_v{src, {2, 1}};
-            EXPECT_TRUE(sav_v.bounds().index_bounds() == multi_span_index<1>{2});
-            EXPECT_TRUE(sav_v.bounds().strides() == multi_span_index<1>{1});
-            EXPECT_TRUE(sav_v[1] == 2);
-
-#if defined(_MSC_VER) && _MSC_VER > 1800
-            strided_span<const volatile int, 1> sav_cv{src, {2, 1}};
-#else
-            strided_span<const volatile int, 1> sav_cv{multi_span<const volatile int>{src},
-                                                       strided_bounds<1>{2, 1}};
-#endif
-            EXPECT_TRUE(sav_cv.bounds().index_bounds() == multi_span_index<1>{2});
-            EXPECT_TRUE(sav_cv.bounds().strides() == multi_span_index<1>{1});
-            EXPECT_TRUE(sav_cv[1] == 2);
-        }
-
-        // From cv-qualified source
-        {
-            const multi_span<const volatile int> src{arr};
-
-            strided_span<const volatile int, 1> sav_cv{src, {2, 1}};
-            EXPECT_TRUE(sav_cv.bounds().index_bounds() == multi_span_index<1>{2});
-            EXPECT_TRUE(sav_cv.bounds().strides() == multi_span_index<1>{1});
-            EXPECT_TRUE(sav_cv[1] == 2);
-        }
-    }
-
-    // EXPECT_TRUE const-casting constructor
-    {
-        int arr[2] = {4, 5};
-
-        const multi_span<int, 2> av(arr, 2);
-        multi_span<const int, 2> av2{av};
-        EXPECT_TRUE(av2[1] == 5);
-
-        static_assert(
-            std::is_convertible<const multi_span<int, 2>, multi_span<const int, 2>>::value,
-            "ctor is not implicit!");
-
-        const strided_span<int, 1> src{arr, {2, 1}};
-        strided_span<const int, 1> sav{src};
-        EXPECT_TRUE(sav.bounds().index_bounds() == multi_span_index<1>{2});
-        EXPECT_TRUE(sav.bounds().stride() == 1);
-        EXPECT_TRUE(sav[1] == 5);
-
-        static_assert(
-            std::is_convertible<const strided_span<int, 1>, strided_span<const int, 1>>::value,
-            "ctor is not implicit!");
-    }
-
-    // EXPECT_TRUE copy constructor
-    {
-        int arr1[2] = {3, 4};
-        const strided_span<int, 1> src1{arr1, {2, 1}};
-        strided_span<int, 1> sav1{src1};
-
-        EXPECT_TRUE(sav1.bounds().index_bounds() == multi_span_index<1>{2});
-        EXPECT_TRUE(sav1.bounds().stride() == 1);
-        EXPECT_TRUE(sav1[0] == 3);
-
-        int arr2[6] = {1, 2, 3, 4, 5, 6};
-        const strided_span<const int, 2> src2{arr2, {{3, 2}, {2, 1}}};
-        strided_span<const int, 2> sav2{src2};
-        EXPECT_TRUE((sav2.bounds().index_bounds() == multi_span_index<2>{3, 2}));
-        EXPECT_TRUE((sav2.bounds().strides() == multi_span_index<2>{2, 1}));
-        EXPECT_TRUE((sav2[{0, 0}]) ==  1);
-        EXPECT_TRUE((sav2[{2, 0}]) == 5);
-    }
-
-    // EXPECT_TRUE const-casting assignment operator
-    {
-        int arr1[2] = {1, 2};
-        int arr2[6] = {3, 4, 5, 6, 7, 8};
-
-        const strided_span<int, 1> src{arr1, {{2}, {1}}};
-        strided_span<const int, 1> sav{arr2, {{3}, {2}}};
-        strided_span<const int, 1>& sav_ref = (sav = src);
-        EXPECT_TRUE(sav.bounds().index_bounds() == multi_span_index<1>{2});
-        EXPECT_TRUE(sav.bounds().strides() == multi_span_index<1>{1});
-        EXPECT_TRUE(sav[0] == 1);
-        EXPECT_TRUE(&sav_ref == &sav);
-    }
-
-    // EXPECT_TRUE copy assignment operator
-    {
-        int arr1[2] = {3, 4};
-        int arr1b[1] = {0};
-        const strided_span<int, 1> src1{arr1, {2, 1}};
-        strided_span<int, 1> sav1{arr1b, {1, 1}};
-        strided_span<int, 1>& sav1_ref = (sav1 = src1);
-        EXPECT_TRUE(sav1.bounds().index_bounds() == multi_span_index<1>{2});
-        EXPECT_TRUE(sav1.bounds().strides() == multi_span_index<1>{1});
-        EXPECT_TRUE(sav1[0] == 3);
-        EXPECT_TRUE(&sav1_ref == &sav1);
-
-        const int arr2[6] = {1, 2, 3, 4, 5, 6};
-        const int arr2b[1] = {0};
-        const strided_span<const int, 2> src2{arr2, {{3, 2}, {2, 1}}};
-        strided_span<const int, 2> sav2{arr2b, {{1, 1}, {1, 1}}};
-        strided_span<const int, 2>& sav2_ref = (sav2 = src2);
-        EXPECT_TRUE((sav2.bounds().index_bounds() == multi_span_index<2>{3, 2}));
-        EXPECT_TRUE((sav2.bounds().strides() == multi_span_index<2>{2, 1}));
-        EXPECT_TRUE((sav2[{0, 0}] == 1));
-        EXPECT_TRUE((sav2[{2, 0}] == 5));
-        EXPECT_TRUE(&sav2_ref == &sav2);
-    }
-}
-
-TEST(strided_span_tests, strided_span_slice)
-{
-    std::vector<int> data(5 * 10);
-    std::iota(begin(data), end(data), 0);
-    const multi_span<int, 5, 10> src =
-        as_multi_span(multi_span<int>{data}, dim<5>(), dim<10>());
-
-    const strided_span<int, 2> sav{src, {{5, 10}, {10, 1}}};
-#ifdef CONFIRM_COMPILATION_ERRORS
-    const strided_span<const int, 2> csav{{src}, {{5, 10}, {10, 1}}};
-#endif
-    const strided_span<const int, 2> csav{multi_span<const int, 5, 10>{src},
-                                          {{5, 10}, {10, 1}}};
-
-    strided_span<int, 1> sav_sl = sav[2];
-    EXPECT_TRUE(sav_sl[0] == 20);
-    EXPECT_TRUE(sav_sl[9] == 29);
-
-    strided_span<const int, 1> csav_sl = sav[3];
-    EXPECT_TRUE(csav_sl[0] == 30);
-    EXPECT_TRUE(csav_sl[9] == 39);
-
-    EXPECT_TRUE(sav[4][0] == 40);
-    EXPECT_TRUE(sav[4][9] == 49);
-}
-
-TEST(strided_span_tests, strided_span_column_major)
-{
-    // strided_span may be used to accommodate more peculiar
-    // use cases, such as column-major multidimensional array
-    // (aka. "FORTRAN" layout).
-
-    int cm_array[3 * 5] = {1, 4, 7, 10, 13, 2, 5, 8, 11, 14, 3, 6, 9, 12, 15};
-    strided_span<int, 2> cm_sav{cm_array, {{5, 3}, {1, 5}}};
-
-    // Accessing elements
-    EXPECT_TRUE((cm_sav[{0, 0}] == 1));
-    EXPECT_TRUE((cm_sav[{0, 1}] == 2));
-    EXPECT_TRUE((cm_sav[{1, 0}] == 4));
-    EXPECT_TRUE((cm_sav[{4, 2}] == 15));
-
-    // Slice
-    strided_span<int, 1> cm_sl = cm_sav[3];
-
-    EXPECT_TRUE(cm_sl[0] == 10);
-    EXPECT_TRUE(cm_sl[1] == 11);
-    EXPECT_TRUE(cm_sl[2] == 12);
-
-    // Section
-    strided_span<int, 2> cm_sec = cm_sav.section({2, 1}, {3, 2});
-
-    EXPECT_TRUE((cm_sec.bounds().index_bounds() == multi_span_index<2>{3, 2}));
-    EXPECT_TRUE((cm_sec[{0, 0}] == 8));
-    EXPECT_TRUE((cm_sec[{0, 1}] == 9));
-    EXPECT_TRUE((cm_sec[{1, 0}] == 11));
-    EXPECT_TRUE((cm_sec[{2, 1}] == 15));
-}
-
-TEST(strided_span_tests, strided_span_bounds)
-{
-    int arr[] = {0, 1, 2, 3};
-    multi_span<int> av(arr);
-
-    std::set_terminate([] {
-        std::cerr << "Expected Death. strided_span_bounds";
-        std::abort();
-    });
-
-    {
-        // incorrect sections
-
-        EXPECT_DEATH(av.section(0, 0)[0], deathstring);
-        EXPECT_DEATH(av.section(1, 0)[0], deathstring);
-        EXPECT_DEATH(av.section(1, 1)[1], deathstring);
-
-        EXPECT_DEATH(av.section(2, 5), deathstring);
-        EXPECT_DEATH(av.section(5, 2), deathstring);
-        EXPECT_DEATH(av.section(5, 0), deathstring);
-        EXPECT_DEATH(av.section(0, 5), deathstring);
-        EXPECT_DEATH(av.section(5, 5), deathstring);
-    }
-
-    {
-        // zero stride
-        strided_span<int, 1> sav{av, {{4}, {}}};
-        EXPECT_TRUE(sav[0] == 0);
-        EXPECT_TRUE(sav[3] == 0);
-        EXPECT_DEATH(sav[4], deathstring);
-    }
-
-    {
-        // zero extent
-        strided_span<int, 1> sav{av, {{}, {1}}};
-        EXPECT_DEATH(sav[0], deathstring);
-    }
-
-    {
-        // zero extent and stride
-        strided_span<int, 1> sav{av, {{}, {}}};
-        EXPECT_DEATH(sav[0], deathstring);
-    }
-
-    {
-        // strided array ctor with matching strided bounds
-        strided_span<int, 1> sav{arr, {4, 1}};
-        EXPECT_TRUE(sav.bounds().index_bounds() == multi_span_index<1>{4});
-        EXPECT_TRUE(sav[3] == 3);
-        EXPECT_DEATH(sav[4], deathstring);
-    }
-
-    {
-        // strided array ctor with smaller strided bounds
-        strided_span<int, 1> sav{arr, {2, 1}};
-        EXPECT_TRUE(sav.bounds().index_bounds() == multi_span_index<1>{2});
-        EXPECT_TRUE(sav[1] == 1);
-        EXPECT_DEATH(sav[2], deathstring);
-    }
-
-    {
-        // strided array ctor with fitting irregular bounds
-        strided_span<int, 1> sav{arr, {2, 3}};
-        EXPECT_TRUE(sav.bounds().index_bounds() == multi_span_index<1>{2});
-        EXPECT_TRUE(sav[0] == 0);
-        EXPECT_TRUE(sav[1] == 3);
-        EXPECT_DEATH(sav[2], deathstring);
-    }
-
-    {
-        // bounds cross data boundaries - from static arrays
-        EXPECT_DEATH((strided_span<int, 1>{arr, {3, 2}}), deathstring);
-        EXPECT_DEATH((strided_span<int, 1>{arr, {3, 3}}), deathstring);
-        EXPECT_DEATH((strided_span<int, 1>{arr, {4, 5}}), deathstring);
-        EXPECT_DEATH((strided_span<int, 1>{arr, {5, 1}}), deathstring);
-        EXPECT_DEATH((strided_span<int, 1>{arr, {5, 5}}), deathstring);
-    }
-
-    {
-        // bounds cross data boundaries - from array view
-        EXPECT_DEATH((strided_span<int, 1>{av, {3, 2}}), deathstring);
-        EXPECT_DEATH((strided_span<int, 1>{av, {3, 3}}), deathstring);
-        EXPECT_DEATH((strided_span<int, 1>{av, {4, 5}}), deathstring);
-        EXPECT_DEATH((strided_span<int, 1>{av, {5, 1}}), deathstring);
-        EXPECT_DEATH((strided_span<int, 1>{av, {5, 5}}), deathstring);
-    }
-
-    {
-        // bounds cross data boundaries - from dynamic arrays
-        EXPECT_DEATH((strided_span<int, 1>{av.data(), 4, {3, 2}}), deathstring);
-        EXPECT_DEATH((strided_span<int, 1>{av.data(), 4, {3, 3}}), deathstring);
-        EXPECT_DEATH((strided_span<int, 1>{av.data(), 4, {4, 5}}), deathstring);
-        EXPECT_DEATH((strided_span<int, 1>{av.data(), 4, {5, 1}}), deathstring);
-        EXPECT_DEATH((strided_span<int, 1>{av.data(), 4, {5, 5}}), deathstring);
-        EXPECT_DEATH((strided_span<int, 1>{av.data(), 2, {2, 2}}), deathstring);
-    }
-
-#ifdef CONFIRM_COMPILATION_ERRORS
-    {
-        strided_span<int, 1> sav0{av.data(), {3, 2}};
-        strided_span<int, 1> sav1{arr, {1}};
-        strided_span<int, 1> sav2{arr, {1, 1, 1}};
-        strided_span<int, 1> sav3{av, {1}};
-        strided_span<int, 1> sav4{av, {1, 1, 1}};
-        strided_span<int, 2> sav5{av.as_multi_span(dim<2>(), dim<2>()), {1}};
-        strided_span<int, 2> sav6{av.as_multi_span(dim<2>(), dim<2>()), {1, 1, 1}};
-        strided_span<int, 2> sav7{av.as_multi_span(dim<2>(), dim<2>()),
-                                  {{1, 1}, {1, 1}, {1, 1}}};
-
-        multi_span_index<1> index{0, 1};
-        strided_span<int, 1> sav8{arr, {1, {1, 1}}};
-        strided_span<int, 1> sav9{arr, {{1, 1}, {1, 1}}};
-        strided_span<int, 1> sav10{av, {1, {1, 1}}};
-        strided_span<int, 1> sav11{av, {{1, 1}, {1, 1}}};
-        strided_span<int, 2> sav12{av.as_multi_span(dim<2>(), dim<2>()), {{1}, {1}}};
-        strided_span<int, 2> sav13{av.as_multi_span(dim<2>(), dim<2>()), {{1}, {1, 1, 1}}};
-        strided_span<int, 2> sav14{av.as_multi_span(dim<2>(), dim<2>()), {{1, 1, 1}, {1}}};
-    }
-#endif
-}
-
-TEST(strided_span_tests, strided_span_type_conversion)
-{
-    int arr[] = {0, 1, 2, 3};
-    multi_span<int> av(arr);
-
-    std::set_terminate([] {
-        std::cerr << "Expected Death. strided_span_type_conversion";
-        std::abort();
-    });
-
-    {
-        strided_span<int, 1> sav{av.data(), av.size(), {av.size() / 2, 2}};
-#ifdef CONFIRM_COMPILATION_ERRORS
-        strided_span<long, 1> lsav1 = sav.as_strided_span<long, 1>();
-#endif
-    }
-    {
-        strided_span<int, 1> sav{av, {av.size() / 2, 2}};
-#ifdef CONFIRM_COMPILATION_ERRORS
-        strided_span<long, 1> lsav1 = sav.as_strided_span<long, 1>();
-#endif
-    }
-
-    multi_span<const byte, dynamic_range> bytes = as_bytes(av);
-
-    // retype strided array with regular strides - from raw data
-    {
-        strided_bounds<2> bounds{{2, bytes.size() / 4}, {bytes.size() / 2, 1}};
-        strided_span<const byte, 2> sav2{bytes.data(), bytes.size(), bounds};
-        strided_span<const int, 2> sav3 = sav2.as_strided_span<const int>();
-        EXPECT_TRUE(sav3[0][0] == 0);
-        EXPECT_TRUE(sav3[1][0] == 2);
-        EXPECT_DEATH(sav3[1][1], deathstring);
-        EXPECT_DEATH(sav3[0][1], deathstring);
-    }
-
-    // retype strided array with regular strides - from multi_span
-    {
-        strided_bounds<2> bounds{{2, bytes.size() / 4}, {bytes.size() / 2, 1}};
-        multi_span<const byte, 2, dynamic_range> bytes2 =
-            as_multi_span(bytes, dim<2>(), dim(bytes.size() / 2));
-        strided_span<const byte, 2> sav2{bytes2, bounds};
-        strided_span<int, 2> sav3 = sav2.as_strided_span<int>();
-        EXPECT_TRUE(sav3[0][0] == 0);
-        EXPECT_TRUE(sav3[1][0] == 2);
-        EXPECT_DEATH(sav3[1][1], deathstring);
-        EXPECT_DEATH(sav3[0][1], deathstring);
-    }
-
-    // retype strided array with not enough elements - last dimension of the array is too small
-    {
-        strided_bounds<2> bounds{{4, 2}, {4, 1}};
-        multi_span<const byte, 2, dynamic_range> bytes2 =
-            as_multi_span(bytes, dim<2>(), dim(bytes.size() / 2));
-        strided_span<const byte, 2> sav2{bytes2, bounds};
-        EXPECT_DEATH(sav2.as_strided_span<int>(), deathstring);
-    }
-
-    // retype strided array with not enough elements - strides are too small
-    {
-        strided_bounds<2> bounds{{4, 2}, {2, 1}};
-        multi_span<const byte, 2, dynamic_range> bytes2 =
-            as_multi_span(bytes, dim<2>(), dim(bytes.size() / 2));
-        strided_span<const byte, 2> sav2{bytes2, bounds};
-        EXPECT_DEATH(sav2.as_strided_span<int>(), deathstring);
-    }
-
-    // retype strided array with not enough elements - last dimension does not divide by the new
-    // typesize
-    {
-        strided_bounds<2> bounds{{2, 6}, {4, 1}};
-        multi_span<const byte, 2, dynamic_range> bytes2 =
-            as_multi_span(bytes, dim<2>(), dim(bytes.size() / 2));
-        strided_span<const byte, 2> sav2{bytes2, bounds};
-        EXPECT_DEATH(sav2.as_strided_span<int>(), deathstring);
-    }
-
-    // retype strided array with not enough elements - strides does not divide by the new
-    // typesize
-    {
-        strided_bounds<2> bounds{{2, 1}, {6, 1}};
-        multi_span<const byte, 2, dynamic_range> bytes2 =
-            as_multi_span(bytes, dim<2>(), dim(bytes.size() / 2));
-        strided_span<const byte, 2> sav2{bytes2, bounds};
-        EXPECT_DEATH(sav2.as_strided_span<int>(), deathstring);
-    }
-
-    // retype strided array with irregular strides - from raw data
-    {
-        strided_bounds<1> bounds{bytes.size() / 2, 2};
-        strided_span<const byte, 1> sav2{bytes.data(), bytes.size(), bounds};
-        EXPECT_DEATH(sav2.as_strided_span<int>(), deathstring);
-    }
-
-    // retype strided array with irregular strides - from multi_span
-    {
-        strided_bounds<1> bounds{bytes.size() / 2, 2};
-        strided_span<const byte, 1> sav2{bytes, bounds};
-        EXPECT_DEATH(sav2.as_strided_span<int>(), deathstring);
-    }
-}
-
-TEST(strided_span_tests, empty_strided_spans)
-{
-    std::set_terminate([] {
-        std::cerr << "Expected Death. empty_strided_spans";
-        std::abort();
-    });
-
-    {
-        multi_span<int, 0> empty_av(nullptr);
-        strided_span<int, 1> empty_sav{empty_av, {0, 1}};
-
-        EXPECT_TRUE(empty_sav.bounds().index_bounds() == multi_span_index<1>{0});
-        EXPECT_TRUE(empty_sav.empty());
-        EXPECT_DEATH(empty_sav[0], deathstring);
-        EXPECT_DEATH(empty_sav.begin()[0], deathstring);
-        EXPECT_DEATH(empty_sav.cbegin()[0], deathstring);
-
-        for (const auto& v : empty_sav) {
-            (void) v;
-            EXPECT_TRUE(false);
-        }
-    }
-
-    {
-        strided_span<int, 1> empty_sav{nullptr, 0, {0, 1}};
-
-        EXPECT_TRUE(empty_sav.bounds().index_bounds() == multi_span_index<1>{0});
-        EXPECT_DEATH(empty_sav[0], deathstring);
-        EXPECT_DEATH(empty_sav.begin()[0], deathstring);
-        EXPECT_DEATH(empty_sav.cbegin()[0], deathstring);
-
-        for (const auto& v : empty_sav) {
-            (void) v;
-            EXPECT_TRUE(false);
-        }
-    }
-}
-
-TEST(strided_span_tests, strided_span_section_iteration)
-{
-    int arr[8] = {4, 0, 5, 1, 6, 2, 7, 3};
-
-    // static bounds
-    {
-        multi_span<int, 8> av(arr, 8);
-        iterate_every_other_element(av);
-    }
-
-    // dynamic bounds
-    {
-        multi_span<int, dynamic_range> av(arr, 8);
-        iterate_every_other_element(av);
-    }
-}
-
-TEST(strided_span_tests, dynamic_strided_span_section_iteration)
-{
-    auto arr = new int[8];
-    for (int i = 0; i < 4; ++i) {
-        arr[2 * i] = 4 + i;
-        arr[2 * i + 1] = i;
-    }
-
-    auto av = as_multi_span(arr, 8);
-    iterate_every_other_element(av);
-
-    delete[] arr;
-}
-
-TEST(strided_span_tests, strided_span_section_iteration_3d)
-{
-    int arr[3][4][2]{};
-    for (auto i = 0; i < 3; ++i) {
-        for (auto j = 0; j < 4; ++j)
-            for (auto k = 0; k < 2; ++k) arr[i][j][k] = 8 * i + 2 * j + k;
-    }
-
-    {
-        multi_span<int, 3, 4, 2> av = arr;
-        iterate_second_slice(av);
-    }
-}
-
-TEST(strided_span_tests, dynamic_strided_span_section_iteration_3d)
-{
-    const auto height = 12, width = 2;
-    const auto size = height * width;
-
-    auto arr = new int[static_cast<std::size_t>(size)];
-    for (auto i = 0; i < size; ++i) {
-        arr[i] = i;
-    }
-
-    {
-        auto av = as_multi_span(as_multi_span(arr, 24), dim<3>(), dim<4>(), dim<2>());
-        iterate_second_slice(av);
-    }
-
-    {
-        auto av = as_multi_span(as_multi_span(arr, 24), dim(3), dim<4>(), dim<2>());
-        iterate_second_slice(av);
-    }
-
-    {
-        auto av = as_multi_span(as_multi_span(arr, 24), dim<3>(), dim(4), dim<2>());
-        iterate_second_slice(av);
-    }
-
-    {
-        auto av = as_multi_span(as_multi_span(arr, 24), dim<3>(), dim<4>(), dim(2));
-        iterate_second_slice(av);
-    }
-    delete[] arr;
-}
-
-TEST(strided_span_tests, strided_span_conversion)
-{
-    std::set_terminate([] {
-        std::cerr << "Expected Death. strided_span_conversion";
-        std::abort();
-    });
-
-    // get an multi_span of 'c' values from the list of X's
-
-    struct X
-    {
-        int a;
-        int b;
-        int c;
-    };
-
-    X arr[4] = {{0, 1, 2}, {3, 4, 5}, {6, 7, 8}, {9, 10, 11}};
-
-    int s = sizeof(int) / sizeof(byte);
-    auto d2 = 3 * s;
-    auto d1 = narrow_cast<int>(sizeof(int)) * 12 / d2;
-
-    // convert to 4x12 array of bytes
-    auto av = as_multi_span(as_bytes(as_multi_span(&arr[0], 4)), dim(d1), dim(d2));
-
-    EXPECT_TRUE(av.bounds().index_bounds()[0] == 4);
-    EXPECT_TRUE(av.bounds().index_bounds()[1] == 12);
-
-    // get the last 4 columns
-    auto section = av.section({0, 2 * s}, {4, s}); // { { arr[0].c[0], arr[0].c[1], arr[0].c[2],
-                                                   // arr[0].c[3] } , { arr[1].c[0], ... } , ...
-                                                   // }
-
-    // convert to array 4x1 array of integers
-    auto cs = section.as_strided_span<int>(); // { { arr[0].c }, {arr[1].c } , ... }
-
-    EXPECT_TRUE(cs.bounds().index_bounds()[0] == 4);
-    EXPECT_TRUE(cs.bounds().index_bounds()[1] == 1);
-
-    // transpose to 1x4 array
-    strided_bounds<2> reverse_bounds{
-        {cs.bounds().index_bounds()[1], cs.bounds().index_bounds()[0]},
-        {cs.bounds().strides()[1], cs.bounds().strides()[0]}};
-
-    strided_span<int, 2> transposed{cs.data(), cs.bounds().total_size(), reverse_bounds};
-
-    // slice to get a one-dimensional array of c's
-    strided_span<int, 1> result = transposed[0];
-
-    EXPECT_TRUE(result.bounds().index_bounds()[0] == 4);
-    EXPECT_DEATH(result.bounds().index_bounds()[1], deathstring);
-
-    int i = 0;
-    for (auto& num : result) {
-        EXPECT_TRUE(num == arr[i].c);
-        i++;
-    }
-}