para/GSL
1
0
Fork 0
mirror of https://github.com/microsoft/GSL.git synced 2024-11-03 17:56:43 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #73 from neilmacintosh/master

Browse Source 
Correct fix for int/size_t mismatch.
This commit is contained in:
Neil MacIntosh 2015-09-27 16:58:07 -07:00
commit 1a0df71f2f
1 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
include/array_view.h
View File

@ -1328,15 +1328,15 @@ namespace details
return bnd.strides(); return bnd.strides();
} }
// Make a stride vector from bounds, assuming continugous memory. // Make a stride vector from bounds, assuming contiguous memory.
template <typename Bounds> 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 _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(); auto extents = bnd.index_bounds();
typename Bounds::index_type stride; typename Bounds::index_type stride;
stride[Bounds::rank - 1] = 1; stride[Bounds::rank - 1] = 1;
for (size_t i = Bounds::rank - 2; i >= 0; --i) for (size_t i = Bounds::rank - 1; Bounds::rank > 1 && i > 0; --i)
stride[i] = stride[i + 1] * extents[i + 1]; stride[i-1] = stride[i] * extents[i];
return stride; return stride;
} }
@ -2035,10 +2035,8 @@ private:
fail_fast_assert(strides[rank - 1] == 1, "Only strided arrays with regular strides can be resized"); fail_fast_assert(strides[rank - 1] == 1, "Only strided arrays with regular strides can be resized");
fail_fast_assert(strides[rank - 2] >= d && (strides[rank - 2] % d == 0), "The strides must have contiguous chunks of memory that can contain a multiple of new type elements"); fail_fast_assert(strides[rank - 2] >= d && (strides[rank - 2] % d == 0), "The strides must have contiguous chunks of memory that can contain a multiple of new type elements");
for (size_t i = rank - 2; i >= 0; --i) for (size_t i = rank - 1; i > 0; --i)
{ fail_fast_assert((strides[i-1] >= strides[i]) && (strides[i-1] % strides[i] == 0), "Only strided arrays with regular strides can be resized");
fail_fast_assert((strides[i] >= strides[i + 1]) && (strides[i] % strides[i + 1] == 0), "Only strided arrays with regular strides can be resized");
}
index_type ret = strides / d; index_type ret = strides / d;
ret[rank - 1] = 1; ret[rank - 1] = 1;