Merge pull request #705 from izaid/id

Updates to match libdynd

Author: izaid

dynd/include/types/pyobject_type.hpp

@@ -13,7 +13,7 @@ extern const dynd::type_id_t pyobject_id;
 
 class PYDYND_API pyobject_type : public dynd::ndt::base_type {
 public:
-  pyobject_type();
+  pyobject_type(dynd::type_id_t new_id);
 
   void print_type(std::ostream &o) const;
   void print_data(std::ostream &o, const char *arrmeta, const char *data) const;

dynd/src/types/pyobject_type.cpp

@@ -13,21 +13,17 @@ using namespace dynd;
 
 const type_id_t pyobject_id = new_id("pyobject", any_kind_id);
 
-pyobject_type::pyobject_type()
-    : ndt::base_type(pyobject_id, sizeof(PyObject *), alignof(PyObject *),
-                     type_flag_none | type_flag_zeroinit, 0, 0, 0)
+pyobject_type::pyobject_type(type_id_t new_id)
+    : ndt::base_type(new_id, pyobject_id, sizeof(PyObject *), alignof(PyObject *), type_flag_none | type_flag_zeroinit,
+                     0, 0, 0)
 {
 }
 
 void pyobject_type::print_type(std::ostream &o) const { o << "pyobject"; }
 
-bool pyobject_type::operator==(const base_type &rhs) const
-{
-  return get_id() == rhs.get_id();
-}
+bool pyobject_type::operator==(const base_type &rhs) const { return get_id() == rhs.get_id(); }
 
-void pyobject_type::print_data(std::ostream &o, const char *arrmeta,
-                               const char *data) const
+void pyobject_type::print_data(std::ostream &o, const char *arrmeta, const char *data) const
 {
   PyObject *repr = PyObject_Repr(*reinterpret_cast<PyObject *const *>(data));
 #if PY_VERSION_HEX < 0x03000000