Skip to content

Updates to match libdynd #608

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
izaid merged 1 commit into from
Mar 1, 2016
Merged

Updates to match libdynd #608

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion dynd/include/numpy_interop.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -461,7 +461,7 @@ inline char numpy_kindchar_of(const dynd::ndt::type &d)
return 'b';
case dynd::int_kind_id:
return 'i';
case dynd::uint_kind:
case dynd::uint_kind_id:
return 'u';
case dynd::float_kind_id:
return 'f';
Expand Down
5 changes: 2 additions & 3 deletions dynd/src/types/pyobject_type.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,8 @@ const type_id_t pyobject_id = ndt::type_registry.insert(
any_kind_id, ndt::type(new pyobject_type(), true));

pyobject_type::pyobject_type()
: ndt::base_type(pyobject_id, custom_kind, sizeof(PyObject *),
alignof(PyObject *), type_flag_none | type_flag_zeroinit,
0, 0, 0)
: ndt::base_type(pyobject_id, sizeof(PyObject *), alignof(PyObject *),
type_flag_none | type_flag_zeroinit, 0, 0, 0)
{
}

Expand Down