Merge pull request #608 from izaid/id

Updates to match libdynd

Author: izaid

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';

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)
 {
 }