From 1e3b80236202859abd812d02b47310c42d34c682 Mon Sep 17 00:00:00 2001 From: Irwin Zaid Date: Tue, 1 Mar 2016 16:47:33 +0000 Subject: [PATCH] Updates to match libdynd --- dynd/include/numpy_interop.hpp | 2 +- dynd/src/types/pyobject_type.cpp | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/dynd/include/numpy_interop.hpp b/dynd/include/numpy_interop.hpp index fd9876fc..7ada76db 100644 --- a/dynd/include/numpy_interop.hpp +++ b/dynd/include/numpy_interop.hpp @@ -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'; diff --git a/dynd/src/types/pyobject_type.cpp b/dynd/src/types/pyobject_type.cpp index 951c9c2c..facb705e 100644 --- a/dynd/src/types/pyobject_type.cpp +++ b/dynd/src/types/pyobject_type.cpp @@ -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) { }