mirror of
https://github.com/ruby/ruby.git
synced 2022-11-09 12:17:21 -05:00
* variable.c (rb_define_hooked_variable): suppress false assertion
with VC9. [ruby-core:22115] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@22322 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
parent
29f73c43a5
commit
b955b34d5f
2 changed files with 31 additions and 31 deletions
|
@ -1,3 +1,8 @@
|
||||||
|
Sun Feb 15 11:45:29 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
|
||||||
|
|
||||||
|
* variable.c (rb_define_hooked_variable): suppress false assertion
|
||||||
|
with VC9. [ruby-core:22115]
|
||||||
|
|
||||||
Sun Feb 15 08:35:33 2009 Tanaka Akira <akr@fsij.org>
|
Sun Feb 15 08:35:33 2009 Tanaka Akira <akr@fsij.org>
|
||||||
|
|
||||||
* test/test_pp.rb: extract from lib/pp.rb.
|
* test/test_pp.rb: extract from lib/pp.rb.
|
||||||
|
|
11
variable.c
11
variable.c
|
@ -470,15 +470,10 @@ rb_define_hooked_variable(
|
||||||
VALUE (*getter)(ANYARGS),
|
VALUE (*getter)(ANYARGS),
|
||||||
void (*setter)(ANYARGS))
|
void (*setter)(ANYARGS))
|
||||||
{
|
{
|
||||||
struct global_variable *gvar;
|
volatile VALUE tmp = var ? *var : Qnil;
|
||||||
ID id;
|
ID id = global_id(name);
|
||||||
VALUE tmp;
|
struct global_variable *gvar = rb_global_entry(id)->var;
|
||||||
|
|
||||||
if (var)
|
|
||||||
tmp = *var;
|
|
||||||
|
|
||||||
id = global_id(name);
|
|
||||||
gvar = rb_global_entry(id)->var;
|
|
||||||
gvar->data = (void*)var;
|
gvar->data = (void*)var;
|
||||||
gvar->getter = getter?(gvar_getter_t *)getter:var_getter;
|
gvar->getter = getter?(gvar_getter_t *)getter:var_getter;
|
||||||
gvar->setter = setter?(gvar_setter_t *)setter:var_setter;
|
gvar->setter = setter?(gvar_setter_t *)setter:var_setter;
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue