1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00

* vm_method.c (make_method_entry_refined): fix wrong use of ||.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@56221 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
shugo 2016-09-23 14:59:26 +00:00
parent b212dd6674
commit 5a121a4f0b
2 changed files with 6 additions and 1 deletions

View file

@ -1,3 +1,7 @@
Fri Sep 23 23:57:40 2016 Shugo Maeda <shugo@ruby-lang.org>
* vm_method.c (make_method_entry_refined): fix wrong use of ||.
Fri Sep 23 21:38:58 2016 Akinori MUSHA <knu@iDaemons.org> Fri Sep 23 21:38:58 2016 Akinori MUSHA <knu@iDaemons.org>
* tool/mdoc2man.rb (Mdoc2Man#parse_macro): Add support for the * tool/mdoc2man.rb (Mdoc2Man#parse_macro): Add support for the

View file

@ -447,7 +447,8 @@ make_method_entry_refined(VALUE owner, rb_method_entry_t *me)
refined.orig_me = refined.orig_me =
rb_method_entry_alloc(me->called_id, me->owner, rb_method_entry_alloc(me->called_id, me->owner,
me->defined_class || owner, me->defined_class ?
me->defined_class : owner,
method_definition_addref(me->def)); method_definition_addref(me->def));
METHOD_ENTRY_FLAGS_COPY(refined.orig_me, me); METHOD_ENTRY_FLAGS_COPY(refined.orig_me, me);
refined.owner = owner; refined.owner = owner;