Updates to match libdynd

Author: izaid

dynd/include/array_functions.hpp

@@ -58,7 +58,7 @@ inline dynd::nd::array make_strided_array(const dynd::ndt::type &dtp, intptr_t n
   else {
     // Allocate the array arrmeta and data in one memory block
     result = dynd::nd::make_array_memory_block(array_tp, array_tp.get_arrmeta_size(), data_size,
-                                           array_tp.get_data_alignment(), &data_ptr);
+                                               array_tp.get_data_alignment(), &data_ptr);
   }
 
   if (array_tp.get_flags() & dynd::type_flag_zeroinit) {
@@ -416,8 +416,7 @@ inline dynd::nd::array nd_fields(const dynd::nd::array &n, PyObject *field_list)
       throw std::runtime_error("nd.fields doesn't support dimensions with pointers yet");
     }
     const dynd::ndt::base_dim_type *budd = tmp_dt.extended<dynd::ndt::base_dim_type>();
-    size_t offset = budd->arrmeta_copy_construct_onedim(dst_arrmeta, src_arrmeta,
-                                                        dynd::intrusive_ptr<dynd::memory_block_data>(n.get(), true));
+    size_t offset = budd->arrmeta_copy_construct_onedim(dst_arrmeta, src_arrmeta, n);
     dst_arrmeta += offset;
     src_arrmeta += offset;
     tmp_dt = budd->get_element_type();
@@ -434,8 +433,7 @@ inline dynd::nd::array nd_fields(const dynd::nd::array &n, PyObject *field_list)
     // Copy the arrmeta for this field
     if (dt.get_arrmeta_size() > 0) {
       dt.extended()->arrmeta_copy_construct(dst_arrmeta + result_arrmeta_offsets[i],
-                                            src_arrmeta + arrmeta_offsets[selected_index[i]],
-                                            dynd::intrusive_ptr<dynd::memory_block_data>(n.get(), true));
+                                            src_arrmeta + arrmeta_offsets[selected_index[i]], n);
     }
   }
 

dynd/include/kernels/apply_pyobject_kernel.hpp

@@ -80,8 +80,7 @@ struct apply_pyobject_kernel : dynd::nd::base_strided_kernel<apply_pyobject_kern
       n.get()->flags = dynd::nd::read_access_flag;
       n.get()->data = const_cast<char *>(src[i]);
       if (src_tp[i].get_arrmeta_size() > 0) {
-        src_tp[i].extended()->arrmeta_copy_construct(n.get()->metadata(), m_src_arrmeta[i],
-                                                     dynd::intrusive_ptr<dynd::memory_block_data>());
+        src_tp[i].extended()->arrmeta_copy_construct(n.get()->metadata(), m_src_arrmeta[i], dynd::nd::memory_block());
       }
       PyTuple_SET_ITEM(args.get(), i, pydynd::array_from_cpp(std::move(n)));
     }
@@ -112,8 +111,7 @@ struct apply_pyobject_kernel : dynd::nd::base_strided_kernel<apply_pyobject_kern
       n.get()->flags = dynd::nd::read_access_flag;
       n.get()->data = const_cast<char *>(src[i]);
       if (src_tp[i].get_arrmeta_size() > 0) {
-        src_tp[i].extended()->arrmeta_copy_construct(n.get()->metadata(), m_src_arrmeta[i],
-                                                     dynd::intrusive_ptr<dynd::memory_block_data>());
+        src_tp[i].extended()->arrmeta_copy_construct(n.get()->metadata(), m_src_arrmeta[i], dynd::nd::memory_block());
       }
       PyTuple_SET_ITEM(args.get(), i, pydynd::array_from_cpp(std::move(n)));
     }

dynd/src/copy_from_numpy_arrfunc.cpp

@@ -189,8 +189,7 @@ void pydynd::nd::array_copy_from_numpy(const dynd::ndt::type &dst_tp, const char
   dynd::nd::array tmp_dst = dynd::nd::make_array_memory_block(dst_tp, dst_tp.get_arrmeta_size());
   tmp_dst.get()->flags = dynd::nd::read_access_flag | dynd::nd::write_access_flag;
   if (dst_tp.get_arrmeta_size() > 0) {
-    dst_tp.extended()->arrmeta_copy_construct(tmp_dst.get()->metadata(), dst_arrmeta,
-                                              dynd::intrusive_ptr<dynd::memory_block_data>());
+    dst_tp.extended()->arrmeta_copy_construct(tmp_dst.get()->metadata(), dst_arrmeta, dynd::nd::memory_block());
   }
   tmp_dst.get()->data = dst_data;
   char *src_data = reinterpret_cast<char *>(PyArray_DATA(src_arr));