diff options
author | Kenta Murata <mrkn@users.noreply.github.com> | 2021-09-06 16:01:52 +0900 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-09-06 16:01:52 +0900 |
commit | f8bb2d9b2724b4a74322ac82d27c32a61153e8dd (patch) | |
tree | e6d8c441f0fd07e119a0a151bb81d218222df8ae | |
parent | a5e323f5edb85fa1bd94bb1e67b8ef8f6827056d (diff) |
memory_view.c: Rename private to private_data for C++ (#4812)
* memory_view.c: Rename private to private_data for C++
* doc/memory_view.md: Update document
* Fix doc/memory_view.md
Co-authored-by: Sutou Kouhei <kou@cozmixng.org>
Co-authored-by: Sutou Kouhei <kou@cozmixng.org>
Notes
Notes:
Merged-By: mrkn <mrkn@ruby-lang.org>
-rw-r--r-- | doc/memory_view.md | 2 | ||||
-rw-r--r-- | include/ruby/memory_view.h | 2 | ||||
-rw-r--r-- | memory_view.c | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/doc/memory_view.md b/doc/memory_view.md index 646a35423a..a24700d0b1 100644 --- a/doc/memory_view.md +++ b/doc/memory_view.md @@ -89,7 +89,7 @@ The MemoryView structure consists of the following members. A `ndim` size array consisting of the offsets in each dimension when the MemoryView exposes a nested array. This can be `NULL` when the MemoryView exposes a flat array. -- `void *const private` +- `void *private_data` The private data that MemoryView provider uses internally. This can be `NULL` when any private data is unnecessary. diff --git a/include/ruby/memory_view.h b/include/ruby/memory_view.h index 4492c06b38..a67c1c0045 100644 --- a/include/ruby/memory_view.h +++ b/include/ruby/memory_view.h @@ -100,7 +100,7 @@ typedef struct { const ssize_t *sub_offsets; /* the private data for managing this exported memory */ - void *const private; + void *private_data; } rb_memory_view_t; typedef bool (* rb_memory_view_get_func_t)(VALUE obj, rb_memory_view_t *view, int flags); diff --git a/memory_view.c b/memory_view.c index 4c6c1225e8..b08f13e286 100644 --- a/memory_view.c +++ b/memory_view.c @@ -210,7 +210,7 @@ rb_memory_view_init_as_byte_array(rb_memory_view_t *view, VALUE obj, void *data, view->shape = NULL; view->strides = NULL; view->sub_offsets = NULL; - *((void **)&view->private) = NULL; + view->private_data = NULL; return true; } |