RYDE-WORK/pybind11
1
0
Fork 0
mirror of https://github.com/RYDE-WORK/pybind11.git synced 2026-02-01 12:40:57 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Only allow unchecked()/mutable_unchecked() on an lvalue

Browse Source 
This should mitigate accidental invocation on a temporary array.

Fixes #961.
This commit is contained in:
Jason Rhinelander 2017-07-25 16:22:45 -04:00
parent 7918bcc95b
commit eb0f1cc7bf
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
include/pybind11/numpy.h
View File

@ -689,7 +689,7 @@ public:
* care: the array must not be destroyed or reshaped for the duration of the returned object, * care: the array must not be destroyed or reshaped for the duration of the returned object,
* and the caller must take care not to access invalid dimensions or dimension indices. * and the caller must take care not to access invalid dimensions or dimension indices.
*/ */
template <typename T, ssize_t Dims = -1> detail::unchecked_mutable_reference<T, Dims> mutable_unchecked() { template <typename T, ssize_t Dims = -1> detail::unchecked_mutable_reference<T, Dims> mutable_unchecked() & {
if (Dims >= 0 && ndim() != Dims) if (Dims >= 0 && ndim() != Dims)
throw std::domain_error("array has incorrect number of dimensions: " + std::to_string(ndim()) + throw std::domain_error("array has incorrect number of dimensions: " + std::to_string(ndim()) +
"; expected " + std::to_string(Dims)); "; expected " + std::to_string(Dims));
@ -703,7 +703,7 @@ public:
* reshaped for the duration of the returned object, and the caller must take care not to access * reshaped for the duration of the returned object, and the caller must take care not to access
* invalid dimensions or dimension indices. * invalid dimensions or dimension indices.
*/ */
template <typename T, ssize_t Dims = -1> detail::unchecked_reference<T, Dims> unchecked() const { template <typename T, ssize_t Dims = -1> detail::unchecked_reference<T, Dims> unchecked() const & {
if (Dims >= 0 && ndim() != Dims) if (Dims >= 0 && ndim() != Dims)
throw std::domain_error("array has incorrect number of dimensions: " + std::to_string(ndim()) + throw std::domain_error("array has incorrect number of dimensions: " + std::to_string(ndim()) +
"; expected " + std::to_string(Dims)); "; expected " + std::to_string(Dims));
@ -876,7 +876,7 @@ public:
* care: the array must not be destroyed or reshaped for the duration of the returned object, * care: the array must not be destroyed or reshaped for the duration of the returned object,
* and the caller must take care not to access invalid dimensions or dimension indices. * and the caller must take care not to access invalid dimensions or dimension indices.
*/ */
template <ssize_t Dims = -1> detail::unchecked_mutable_reference<T, Dims> mutable_unchecked() { template <ssize_t Dims = -1> detail::unchecked_mutable_reference<T, Dims> mutable_unchecked() & {
return array::mutable_unchecked<T, Dims>(); return array::mutable_unchecked<T, Dims>();
} }
@ -887,7 +887,7 @@ public:
* for the duration of the returned object, and the caller must take care not to access invalid * for the duration of the returned object, and the caller must take care not to access invalid
* dimensions or dimension indices. * dimensions or dimension indices.
*/ */
template <ssize_t Dims = -1> detail::unchecked_reference<T, Dims> unchecked() const { template <ssize_t Dims = -1> detail::unchecked_reference<T, Dims> unchecked() const & {
return array::unchecked<T, Dims>(); return array::unchecked<T, Dims>();
} }