Make array_view.set return a bool.

QuLogic · QuLogic · commit 949cc292739a · 2020-05-20T02:54:16.000-04:00
It only returns 0 or 1, so bool hold a better meaning here.
diff --git a/src/numpy_cpp.h b/src/numpy_cpp.h
@@ -441,7 +441,7 @@ class array_view : public detail::array_view_accessors<array_view, T, ND>
         return *this;
     }
 
-    int set(PyObject *arr, bool contiguous = false)
+    bool set(PyObject *arr, bool contiguous = false)
     {
         PyArrayObject *tmp;
 
@@ -458,7 +458,7 @@ class array_view : public detail::array_view_accessors<array_view, T, ND>
                 tmp = (PyArrayObject *)PyArray_FromObject(arr, type_num_of<T>::value, 0, ND);
             }
             if (tmp == NULL) {
-                return 0;
+                return false;
             }
 
             if (PyArray_NDIM(tmp) == 0 || PyArray_DIM(tmp, 0) == 0) {
@@ -469,7 +469,7 @@ class array_view : public detail::array_view_accessors<array_view, T, ND>
                 m_strides = zeros;
                 if (PyArray_NDIM(tmp) == 0 && ND == 0) {
                     m_arr = tmp;
-                    return 1;
+                    return true;
                 }
             }
             if (PyArray_NDIM(tmp) != ND) {
@@ -478,7 +478,7 @@ class array_view : public detail::array_view_accessors<array_view, T, ND>
                              ND,
                              PyArray_NDIM(tmp));
                 Py_DECREF(tmp);
-                return 0;
+                return false;
             }
 
             /* Copy some of the data to the view object for faster access */
@@ -489,7 +489,7 @@ class array_view : public detail::array_view_accessors<array_view, T, ND>
             m_data = (char *)PyArray_BYTES(tmp);
         }
 
-        return 1;
+        return true;
     }
 
     npy_intp dim(size_t i) const

Original file line number	Diff line number	Diff line change
`@@ -441,7 +441,7 @@ class array_view : public detail::array_view_accessors<array_view, T, ND>`
`441`	`441`	`return *this;`
`442`	`442`	`}`
`443`	`443`
`444`		`- int set(PyObject *arr, bool contiguous = false)`
	`444`	`+ bool set(PyObject *arr, bool contiguous = false)`
`445`	`445`	`{`
`446`	`446`	`PyArrayObject *tmp;`
`447`	`447`
`@@ -458,7 +458,7 @@ class array_view : public detail::array_view_accessors<array_view, T, ND>`
`458`	`458`	`tmp = (PyArrayObject *)PyArray_FromObject(arr, type_num_of<T>::value, 0, ND);`
`459`	`459`	`}`
`460`	`460`	`if (tmp == NULL) {`
`461`		`- return 0;`
	`461`	`+ return false;`
`462`	`462`	`}`
`463`	`463`
`464`	`464`	`if (PyArray_NDIM(tmp) == 0 \|\| PyArray_DIM(tmp, 0) == 0) {`
`@@ -469,7 +469,7 @@ class array_view : public detail::array_view_accessors<array_view, T, ND>`
`469`	`469`	`m_strides = zeros;`
`470`	`470`	`if (PyArray_NDIM(tmp) == 0 && ND == 0) {`
`471`	`471`	`m_arr = tmp;`
`472`		`- return 1;`
	`472`	`+ return true;`
`473`	`473`	`}`
`474`	`474`	`}`
`475`	`475`	`if (PyArray_NDIM(tmp) != ND) {`
`@@ -478,7 +478,7 @@ class array_view : public detail::array_view_accessors<array_view, T, ND>`
`478`	`478`	`ND,`
`479`	`479`	`PyArray_NDIM(tmp));`
`480`	`480`	`Py_DECREF(tmp);`
`481`		`- return 0;`
	`481`	`+ return false;`
`482`	`482`	`}`
`483`	`483`
`484`	`484`	`/* Copy some of the data to the view object for faster access */`
`@@ -489,7 +489,7 @@ class array_view : public detail::array_view_accessors<array_view, T, ND>`
`489`	`489`	`m_data = (char *)PyArray_BYTES(tmp);`
`490`	`490`	`}`
`491`	`491`
`492`		`- return 1;`
	`492`	`+ return true;`
`493`	`493`	`}`
`494`	`494`
`495`	`495`	`npy_intp dim(size_t i) const`