Skip to content

Commit d04e32b

Browse files
committed
Merge remote-tracking branch 'upstream/main' into doc/column_factories
2 parents 098503b + 1d966e9 commit d04e32b

3 files changed

Lines changed: 5 additions & 5 deletions

File tree

‎cpp/src/arrow/buffer.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -269,7 +269,7 @@ class ARROW_EXPORT Buffer {
269269

270270
/// \brief Return the buffer's mutable data as a span
271271
template <typename T>
272-
util::span<T> mutable_span_as() const {
272+
util::span<T> mutable_span_as() {
273273
return util::span(mutable_data_as<T>(), static_cast<size_t>(size() / sizeof(T)));
274274
}
275275

‎python/pyarrow/types.pxi‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5462,7 +5462,7 @@ cdef void pycapsule_schema_deleter(object schema_capsule) noexcept:
54625462

54635463
free(schema)
54645464

5465-
cdef object alloc_c_schema(ArrowSchema** c_schema) noexcept:
5465+
cdef object alloc_c_schema(ArrowSchema** c_schema):
54665466
c_schema[0] = <ArrowSchema*> malloc(sizeof(ArrowSchema))
54675467
# Ensure the capsule destructor doesn't call a random release pointer
54685468
c_schema[0].release = NULL
@@ -5481,7 +5481,7 @@ cdef void pycapsule_array_deleter(object array_capsule) noexcept:
54815481

54825482
free(array)
54835483

5484-
cdef object alloc_c_array(ArrowArray** c_array) noexcept:
5484+
cdef object alloc_c_array(ArrowArray** c_array):
54855485
c_array[0] = <ArrowArray*> malloc(sizeof(ArrowArray))
54865486
# Ensure the capsule destructor doesn't call a random release pointer
54875487
c_array[0].release = NULL
@@ -5500,7 +5500,7 @@ cdef void pycapsule_stream_deleter(object stream_capsule) noexcept:
55005500

55015501
free(stream)
55025502

5503-
cdef object alloc_c_stream(ArrowArrayStream** c_stream) noexcept:
5503+
cdef object alloc_c_stream(ArrowArrayStream** c_stream):
55045504
c_stream[0] = <ArrowArrayStream*> malloc(sizeof(ArrowArrayStream))
55055505
# Ensure the capsule destructor doesn't call a random release pointer
55065506
c_stream[0].release = NULL

‎r/R/install-arrow.R‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -251,7 +251,7 @@ create_package_with_all_dependencies <- function(dest_file = NULL, source_file =
251251
setwd(untar_dir)
252252

253253
message("Repacking tar.gz file to ", dest_file)
254-
tar_successful <- utils::tar(dest_file, compression = "gz") == 0
254+
tar_successful <- utils::tar(dest_file, compression = "gz", extra_flags = NULL) == 0
255255
if (!tar_successful) {
256256
stop("Failed to create new tar.gz file")
257257
}

0 commit comments

Comments
 (0)