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 Microsoft/GSL:master into branch and resolved conflicts.

Browse Source
This commit is contained in:
Kern Handa 2015-09-28 07:48:08 +00:00
commit 001a64c812
2 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
include/array_view.h
View File

@ -1067,7 +1067,7 @@ public:
} }
bounds_iterator& operator--() _NOEXCEPT bounds_iterator& operator--() _NOEXCEPT
{ {
for (int i = rank; i-- > 0;) for (size_t i = rank; i-- > 0;)
{ {
if (curr[i]-- > 0) if (curr[i]-- > 0)
{ {
@ -1328,14 +1328,14 @@ 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 - 1; i > 0; --i) for (size_t i = Bounds::rank - 1; Bounds::rank > 1 && i > 0; --i)
stride[i-1] = stride[i] * extents[i]; 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 (int 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;

1
tests/owner_tests.cpp
View File

@ -33,6 +33,7 @@ SUITE(owner_tests)
CHECK(*p == 120); CHECK(*p == 120);
f(p); f(p);
CHECK(*p == 121); CHECK(*p == 121);
delete p;
} }
} }