Zengtudor
/
pybind11
mirror of https://github.com/pybind/pybind11.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #354 from aldanor/bugfix/int_-shadow 

Fix int_ shadowing problem in detail namespace
This commit is contained in:
Wenzel Jakob 2016-08-25 01:40:53 +02:00 committed by GitHub
parent b692896fc7 1c8828fe8f
commit ce55683084
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/pybind11/numpy.h
View File

@ -407,7 +407,7 @@ struct npy_format_descriptor<T, typename std::enable_if<is_pod_struct<T>::value>
pybind11_fail("NumPy: unsupported field dtype");
names.append(PYBIND11_STR_TYPE(field.name));
formats.append(field.descr);
offsets.append(int_(field.offset));
offsets.append(pybind11::int_(field.offset));
}
dtype_ptr = pybind11::dtype(names, formats, offsets, sizeof(T)).release().ptr();