Zengtudor/pybind11
1
0
Fork 0
mirror of https://github.com/pybind/pybind11.git synced 2024-11-26 15:12:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update npy_format_descriptor::name()

Browse Source
This commit is contained in:
Ivan Smirnov 2016-07-18 19:58:20 +01:00
parent 076b953ccd
commit 41c3399021
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
example/example20.py
View File

@ -70,3 +70,5 @@ check_eq(arr, [((False, 0, 0.0), (True, 1, 1.5)),
((True, 1, 1.5), (False, 2, 3.0)), ((True, 1, 1.5), (False, 2, 3.0)),
((False, 2, 3.0), (True, 3, 4.5))], nested_dtype) ((False, 2, 3.0), (True, 3, 4.5))], nested_dtype)
print_rec_nested(arr) print_rec_nested(arr)
assert create_rec_nested.__doc__.strip().endswith('numpy.ndarray[dtype=NestedStruct]')

2
include/pybind11/numpy.h
View File

@ -281,7 +281,7 @@ struct field_descriptor {
template <typename T> template <typename T>
struct npy_format_descriptor<T, typename std::enable_if<is_pod_struct<T>::value>::type> { struct npy_format_descriptor<T, typename std::enable_if<is_pod_struct<T>::value>::type> {
static PYBIND11_DESCR name() { return _("user-defined"); } static PYBIND11_DESCR name() { return _("struct"); }
static object dtype() { static object dtype() {
if (!dtype_()) if (!dtype_())