From 8918a9cf6c65409ae1ffcdea324a1b97c6e5bb70 Mon Sep 17 00:00:00 2001 From: Nobuyoshi Nakada Date: Tue, 22 Dec 2020 01:00:43 +0900 Subject: Removed rb_cData entity * Use the wrapper of rb_cObject instead of data access * Replaced rest of extentions * Updated the version guard for Data * Added the version guard of rb_cData --- include/ruby/internal/core/rdata.h | 10 ++++++++++ include/ruby/internal/globals.h | 3 --- 2 files changed, 10 insertions(+), 3 deletions(-) (limited to 'include/ruby') diff --git a/include/ruby/internal/core/rdata.h b/include/ruby/internal/core/rdata.h index 0824bbcc16..ca44a931dc 100644 --- a/include/ruby/internal/core/rdata.h +++ b/include/ruby/internal/core/rdata.h @@ -74,6 +74,7 @@ struct RData { RBIMPL_SYMBOL_EXPORT_BEGIN() VALUE rb_data_object_wrap(VALUE klass, void *datap, RUBY_DATA_FUNC dmark, RUBY_DATA_FUNC dfree); VALUE rb_data_object_zalloc(VALUE klass, size_t size, RUBY_DATA_FUNC dmark, RUBY_DATA_FUNC dfree); +RUBY_EXTERN VALUE rb_cObject; RBIMPL_SYMBOL_EXPORT_END() #define Data_Wrap_Struct(klass, mark, free, sval) \ @@ -162,6 +163,15 @@ rb_data_object_alloc(VALUE klass, void *data, RUBY_DATA_FUNC dmark, RUBY_DATA_FU return rb_data_object_wrap(klass, data, dmark, dfree); } +RBIMPL_ATTR_DEPRECATED(("by: rb_cObject. Will be removed in 3.1.")) +RBIMPL_ATTR_PURE() +static inline VALUE +rb_cData(void) +{ + return rb_cObject; +} +#define rb_cData rb_cData() + #define rb_data_object_wrap_0 rb_data_object_wrap #define rb_data_object_wrap_1 rb_data_object_wrap_warning #define rb_data_object_wrap RUBY_MACRO_SELECT(rb_data_object_wrap_, RUBY_UNTYPED_DATA_WARNING) diff --git a/include/ruby/internal/globals.h b/include/ruby/internal/globals.h index 6b4e8fd885..3bfbeacd96 100644 --- a/include/ruby/internal/globals.h +++ b/include/ruby/internal/globals.h @@ -20,7 +20,6 @@ * extension libraries. They could be written in C++98. * @brief Ruby-level global variables / constants, visible from C. */ -#include "ruby/internal/attr/deprecated.h" #include "ruby/internal/attr/pure.h" #include "ruby/internal/dllexport.h" #include "ruby/internal/fl_type.h" @@ -49,8 +48,6 @@ RUBY_EXTERN VALUE rb_cArray; RUBY_EXTERN VALUE rb_cBinding; RUBY_EXTERN VALUE rb_cClass; RUBY_EXTERN VALUE rb_cCont; -RBIMPL_ATTR_DEPRECATED(("by: rb_cObject. Will be removed in 3.1.")) -RUBY_EXTERN VALUE rb_cData; RUBY_EXTERN VALUE rb_cDir; RUBY_EXTERN VALUE rb_cEncoding; RUBY_EXTERN VALUE rb_cEnumerator; -- cgit v1.2.3