Skip to content

Commit da2c5ad

Browse files
committed
Merge pull request #678 from izaid/memblock
Updates to match libdynd
2 parents 09b244a + a1eb691 commit da2c5ad

2 files changed

Lines changed: 1 addition & 7 deletions

File tree

dynd/include/array_functions.hpp

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,6 @@ inline dynd::nd::array make_strided_array(const dynd::ndt::type &dtp, intptr_t n
7373
// Fill in the preamble arrmeta
7474
dynd::nd::array_preamble *ndo = reinterpret_cast<dynd::nd::array_preamble *>(result.get());
7575
ndo->data = data_ptr;
76-
ndo->owner = dynd::nd::memory_block();
7776
ndo->flags = dynd::nd::read_access_flag | dynd::nd::write_access_flag;
7877

7978
if (!any_variable_dims) {
@@ -395,14 +394,10 @@ inline dynd::nd::array nd_fields(const dynd::nd::array &n, PyObject *field_list)
395394

396395
// Allocate the new memory block.
397396
size_t arrmeta_size = result_tp.get_arrmeta_size();
398-
dynd::nd::array result = dynd::nd::make_array_memory_block(result_tp, arrmeta_size);
397+
dynd::nd::array result = dynd::nd::make_array_memory_block(result_tp, arrmeta_size, n->get_owner() ? n->get_owner() : n);
399398

400399
// Clone the data pointer
401400
result.get()->data = n.get()->data;
402-
result->owner = n->owner;
403-
if (!result->owner) {
404-
result->owner = n;
405-
}
406401

407402
// Copy the flags
408403
result.get()->flags = n.get()->flags;

dynd/src/array_from_py.cpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -440,7 +440,6 @@ dynd::nd::array pydynd::array_from_py(PyObject *obj, uint32_t access_flags, bool
440440
result = nd::make_array_memory_block(d, d.extended()->get_arrmeta_size(), d.get_data_size(),
441441
d.get_data_alignment(), &data_ptr);
442442
result.get()->data = data_ptr;
443-
result.get()->owner = nd::memory_block();
444443
// The scalar consists of pointers to the byte string data
445444
reinterpret_cast<dynd::string *>(data_ptr)->assign(data, len);
446445
// The arrmeta

0 commit comments

Comments
 (0)