Updates to match libdynd

Author: izaid

dynd/include/array_functions.hpp

@@ -362,7 +362,7 @@ inline dynd::nd::array nd_fields(const dynd::nd::array &n, PyObject *field_list)
   // Allocate the new memory block.
   size_t arrmeta_size = result_tp.get_arrmeta_size();
   dynd::nd::array result =
-      dynd::nd::make_array(result_tp, n->get_data(), n.get_owner() ? n.get_owner() : n, n.get_flags());
+      dynd::nd::make_array(result_tp, const_cast<char *>(n.cdata()), n.get_owner() ? n.get_owner() : n, n.get_flags());
 
   // First copy all the array data type arrmeta
   dynd::ndt::type tmp_dt = result_tp;

dynd/src/array_as_numpy.cpp

@@ -582,7 +582,8 @@ PyObject *pydynd::array_as_numpy(PyObject *a_obj, bool allow_copy)
   else {
     // Create a view directly to the dynd array
     pyobject_ownref result(PyArray_NewFromDescr(
-        &PyArray_Type, (PyArray_Descr *)numpy_dtype.release(), (int)ndim, shape.get(), strides.get(), a->get_data(),
+        &PyArray_Type, (PyArray_Descr *)numpy_dtype.release(), (int)ndim, shape.get(), strides.get(),
+        const_cast<char *>(a.cdata()),
         ((a.get_flags() & nd::write_access_flag) ? NPY_ARRAY_WRITEABLE : 0) | NPY_ARRAY_ALIGNED, NULL));
 
 #if NPY_API_VERSION >= 7 // At least NumPy 1.7

dynd/src/array_as_pep3118.cpp

@@ -253,18 +253,17 @@ int pydynd::array_getbuffer_pep3118(PyObject *ndo, Py_buffer *buffer, int flags)
       throw runtime_error("array_getbuffer_pep3118 called on a non-array");
     }
     nd::array &n = pydynd::array_to_cpp_ref(ndo);
-    const nd::array_preamble *preamble = n.get();
     ndt::type tp = n.get_type();
 
     // Check if a writable buffer is requested
     if ((flags & PyBUF_WRITABLE) && !(n.get_flags() & nd::write_access_flag)) {
       throw runtime_error("dynd array is not writable");
     }
     buffer->readonly = ((n.get_flags() & nd::write_access_flag) == 0);
-    buffer->buf = preamble->get_data();
+    buffer->buf = const_cast<char *>(n.cdata());
 
     if (tp.get_id() == bytes_id || tp.get_id() == fixed_bytes_id) {
-      array_getbuffer_pep3118_bytes(tp, n.get()->metadata(), n->get_data(), buffer, flags);
+      array_getbuffer_pep3118_bytes(tp, n.get()->metadata(), const_cast<char *>(n.cdata()), buffer, flags);
       return 0;
     }