Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
gaoqiong
pybind11
Commits
ce556830
Commit
ce556830
authored
Aug 25, 2016
by
Wenzel Jakob
Committed by
GitHub
Aug 25, 2016
Browse files
Merge pull request #354 from aldanor/bugfix/int_-shadow
Fix int_ shadowing problem in detail namespace
parents
b692896f
1c8828fe
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
1 addition
and
1 deletion
+1
-1
include/pybind11/numpy.h
include/pybind11/numpy.h
+1
-1
No files found.
include/pybind11/numpy.h
View file @
ce556830
...
...
@@ -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
();
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment