Merge pull request #677 from izaid/master

Updates to match libdynd

Author: izaid

dynd/src/array_from_py.cpp

@@ -434,8 +434,8 @@ dynd::nd::array pydynd::array_from_py(PyObject *obj, uint32_t access_flags, bool
     // Python bytes are immutable, so simply use the existing memory with an
     // external memory
     Py_INCREF(obj);
-    intrusive_ptr<memory_block_data> bytesref =
-        make_external_memory_block(reinterpret_cast<void *>(obj), &py_decref_function);
+    nd::memory_block bytesref =
+        nd::make_memory_block<nd::external_memory_block>(reinterpret_cast<void *>(obj), &py_decref_function);
     char *data_ptr;
     result = nd::make_array_memory_block(d, d.extended()->get_arrmeta_size(), d.get_data_size(),
                                         d.get_data_alignment(), &data_ptr);

dynd/src/numpy_interop.cpp

@@ -123,10 +123,10 @@ dynd::nd::array pydynd::array_from_numpy_array(PyArrayObject *obj, uint32_t acce
 
     // Get a shared pointer that tracks buffer ownership
     PyObject *base = PyArray_BASE(obj);
-    dynd::intrusive_ptr<dynd::memory_block_data> memblock;
+    dynd::nd::memory_block memblock;
     if (base == NULL || (PyArray_FLAGS(obj) & NPY_ARRAY_UPDATEIFCOPY) != 0) {
       Py_INCREF(obj);
-      memblock = dynd::make_external_memory_block(obj, py_decref_function);
+      memblock = dynd::nd::make_memory_block<dynd::nd::external_memory_block>(obj, py_decref_function);
     }
     else {
       if (PyObject_TypeCheck(base, pydynd::get_array_pytypeobject())) {
@@ -136,7 +136,7 @@ dynd::nd::array pydynd::array_from_numpy_array(PyArrayObject *obj, uint32_t acce
       }
       else {
         Py_INCREF(base);
-        memblock = dynd::make_external_memory_block(base, py_decref_function);
+        memblock = dynd::nd::make_memory_block<dynd::nd::external_memory_block>(base, py_decref_function);
       }
     }