diff options
author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2015-05-20 05:09:00 +0000 |
---|---|---|
committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2015-05-20 05:09:00 +0000 |
commit | 6511228df62508c63e960b97e30eb33b2d3a5362 (patch) | |
tree | 39c2e3e2d752d6642d041ea2fa5b96900dcf103e | |
parent | a7a2a66f2ef7d0a54ce54abb74c525b2e4d9f5d7 (diff) | |
download | ruby-6511228df62508c63e960b97e30eb33b2d3a5362.tar.gz |
ruby.h: warn old names
* include/ruby/ruby.h (rb_data_typed_object_alloc),
(rb_data_object_alloc): warn use of old names.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@50558 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | gc.c | 3 | ||||
-rw-r--r-- | include/ruby/ruby.h | 20 |
2 files changed, 21 insertions, 2 deletions
@@ -11,6 +11,9 @@ **********************************************************************/ +#define rb_data_object_alloc rb_data_object_alloc +#define rb_data_typed_object_alloc rb_data_typed_object_alloc + #include "internal.h" #include "ruby/st.h" #include "ruby/re.h" diff --git a/include/ruby/ruby.h b/include/ruby/ruby.h index 039b40ee8c..b3c05391be 100644 --- a/include/ruby/ruby.h +++ b/include/ruby/ruby.h @@ -1013,8 +1013,6 @@ typedef void (*RUBY_DATA_FUNC)(void*); # define RUBY_UNTYPED_DATA_WARNING 0 # endif #endif -#define rb_data_object_alloc rb_data_object_wrap -#define rb_data_typed_object_alloc rb_data_typed_object_wrap VALUE rb_data_object_wrap(VALUE,void*,RUBY_DATA_FUNC,RUBY_DATA_FUNC); VALUE rb_data_object_zalloc(VALUE,size_t,RUBY_DATA_FUNC,RUBY_DATA_FUNC); VALUE rb_data_typed_object_wrap(VALUE klass, void *datap, const rb_data_type_t *); @@ -1245,6 +1243,24 @@ rb_data_typed_object_make(VALUE klass, const rb_data_type_t *type, void **datap, return result; } +#ifndef rb_data_object_alloc +DEPRECATED_BY(rb_data_object_wrap, static inline VALUE rb_data_object_alloc(VALUE,void*,RUBY_DATA_FUNC,RUBY_DATA_FUNC)); +static inline VALUE +rb_data_object_alloc(VALUE klass, void *data, RUBY_DATA_FUNC dmark, RUBY_DATA_FUNC dfree) +{ + return rb_data_object_wrap(klass, data, dmark, dfree); +} +#endif + +#ifndef rb_data_typed_object_alloc +DEPRECATED_BY(rb_data_typed_object_wrap, static inline VALUE rb_data_typed_object_alloc(VALUE,void*,const rb_data_type_t*)); +static inline VALUE +rb_data_typed_object_alloc(VALUE klass, void *datap, const rb_data_type_t *type) +{ + return rb_data_typed_object_wrap(klass, datap, type); +} +#endif + #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) |