Merge pull request #706 from izaid/id

Updates to match libdynd

Author: izaid

dynd/include/types/pyobject_type.hpp

@@ -9,8 +9,6 @@
 
 #include <dynd/types/base_type.hpp>
 
-extern const dynd::type_id_t pyobject_id;
-
 class PYDYND_API pyobject_type : public dynd::ndt::base_type {
 public:
   pyobject_type(dynd::type_id_t new_id);
@@ -29,5 +27,10 @@ namespace ndt {
     static type equivalent() { return make_type<pyobject_type>(); }
   };
 
+  template <>
+  struct id_of<pyobject_type> {
+    static const type_id_t value;
+  };
+
 } // namespace dynd::ndt
 } // namespace dynd

dynd/src/types/pyobject_type.cpp

@@ -11,11 +11,9 @@
 
 using namespace dynd;
 
-const type_id_t pyobject_id = new_id("pyobject", any_kind_id);
-
 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)
+    : ndt::base_type(new_id, ndt::id_of<pyobject_type>::value, sizeof(PyObject *), alignof(PyObject *),
+                     type_flag_none | type_flag_zeroinit, 0, 0, 0)
 {
 }
 
@@ -33,3 +31,5 @@ void pyobject_type::print_data(std::ostream &o, const char *arrmeta, const char
 #endif
   Py_DECREF(repr);
 }
+
+const type_id_t ndt::id_of<pyobject_type>::value = new_id("pyobject", any_kind_id);