Skip to content

GitLab

Commit 9bb33131 authored by Henry Schreiner's avatar Henry Schreiner Committed by Wenzel Jakob
Browse files

Fixing warnings about conversions in GCC 7+ (#1753)

parent 73b840dc
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 2 deletions
include/pybind11/numpy.h
View file @ 9bb33131
...@@ -855,14 +855,14 @@ public: ...@@ -855,14 +855,14 @@ public:
// Reference to element at a given index // Reference to element at a given index
template<typename... Ix> const T& at(Ix... index) const { template<typename... Ix> const T& at(Ix... index) const {
if (sizeof...(index) != ndim()) if ((ssize_t) sizeof...(index) != ndim())
fail_dim_check(sizeof...(index), "index dimension mismatch"); fail_dim_check(sizeof...(index), "index dimension mismatch");
return *(static_cast<const T*>(array::data()) + byte_offset(ssize_t(index)...) / itemsize()); return *(static_cast<const T*>(array::data()) + byte_offset(ssize_t(index)...) / itemsize());
} }
// Mutable reference to element at a given index // Mutable reference to element at a given index
template<typename... Ix> T& mutable_at(Ix... index) { template<typename... Ix> T& mutable_at(Ix... index) {
if (sizeof...(index) != ndim()) if ((ssize_t) sizeof...(index) != ndim())
fail_dim_check(sizeof...(index), "index dimension mismatch"); fail_dim_check(sizeof...(index), "index dimension mismatch");
return *(static_cast<T*>(array::mutable_data()) + byte_offset(ssize_t(index)...) / itemsize()); return *(static_cast<T*>(array::mutable_data()) + byte_offset(ssize_t(index)...) / itemsize());
} }
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment