diff options
author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2014-11-29 07:14:53 +0000 |
---|---|---|
committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2014-11-29 07:14:53 +0000 |
commit | 544d28c300b5a8084693968cb88b75443def8ab2 (patch) | |
tree | b4aeb34d838ca1dc0ee7d51601fb22de1b1e9d6a /error.c | |
parent | c8da47e859acaad5b18847af3fd7e8c1c07121a4 (diff) |
ruby.h: no parent in rb_data_type_t
* error.c (rb_typeddata_is_kind_of, rb_check_typeddata): ditto.
* error.c (rb_typeddata_inherited_p): deprecate. still keep for
potential binary compatibility.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@48647 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'error.c')
-rw-r--r-- | error.c | 10 |
1 files changed, 4 insertions, 6 deletions
@@ -541,10 +541,8 @@ rb_check_type(VALUE x, int t) int rb_typeddata_inherited_p(const rb_data_type_t *child, const rb_data_type_t *parent) { - while (child) { - if (child == parent) return 1; - child = child->parent; - } + rb_warn("rb_typeddata_inherited_p() is deprecated"); + if (child == parent) return 1; return 0; } @@ -552,7 +550,7 @@ int rb_typeddata_is_kind_of(VALUE obj, const rb_data_type_t *data_type) { if (!RB_TYPE_P(obj, T_DATA) || - !RTYPEDDATA_P(obj) || !rb_typeddata_inherited_p(RTYPEDDATA_TYPE(obj), data_type)) { + !RTYPEDDATA_P(obj) || RTYPEDDATA_TYPE(obj) != data_type) { return 0; } return 1; @@ -572,7 +570,7 @@ rb_check_typeddata(VALUE obj, const rb_data_type_t *data_type) etype = rb_obj_classname(obj); rb_raise(rb_eTypeError, mesg, etype, data_type->wrap_struct_name); } - else if (!rb_typeddata_inherited_p(RTYPEDDATA_TYPE(obj), data_type)) { + else if (RTYPEDDATA_TYPE(obj) != data_type) { etype = RTYPEDDATA_TYPE(obj)->wrap_struct_name; rb_raise(rb_eTypeError, mesg, etype, data_type->wrap_struct_name); } |