mirror of
https://github.com/ruby/ruby.git
synced 2022-11-09 12:17:21 -05:00
* marshal.c (w_uclass): cloned class is not user
class. (ruby-bugs-ja#PR103) * marshal.c (r_object): Struct subclass couldn't load. (ruby-bugs-ja#PR104) git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@1792 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
parent
78592877b7
commit
eaab0aa79a
3 changed files with 12 additions and 4 deletions
|
@ -1,3 +1,11 @@
|
|||
Fri Oct 19 17:55:14 2001 Nobuyoshi Nakada <nobu.nakada@nifty.ne.jp>
|
||||
|
||||
* marshal.c (w_uclass): cloned class is not user
|
||||
class. (ruby-bugs-ja#PR103)
|
||||
|
||||
* marshal.c (r_object): Struct subclass couldn't
|
||||
load. (ruby-bugs-ja#PR104)
|
||||
|
||||
Wed Oct 17 14:12:50 2001 Nobuyoshi Nakada <nobu.nakada@nifty.ne.jp>
|
||||
|
||||
* variable.c (alias_fixup): added. ad hoc support for ordinary
|
||||
|
|
|
@ -247,7 +247,7 @@ w_uclass(obj, klass, arg)
|
|||
VALUE obj, klass;
|
||||
struct dump_arg *arg;
|
||||
{
|
||||
if (CLASS_OF(obj) != klass) {
|
||||
if (rb_class_real(CLASS_OF(obj)) != klass) {
|
||||
w_byte(TYPE_UCLASS, arg);
|
||||
w_unique(rb_class2name(CLASS_OF(obj)), arg);
|
||||
}
|
||||
|
@ -933,7 +933,7 @@ r_object(arg)
|
|||
ID slot;
|
||||
|
||||
klass = rb_path2class(r_unique(arg));
|
||||
mem = rb_ivar_get(klass, rb_intern("__member__"));
|
||||
mem = rb_struct_iv_get(klass, "__member__");
|
||||
if (mem == Qnil) {
|
||||
rb_raise(rb_eTypeError, "uninitialized struct");
|
||||
}
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
#define RUBY_VERSION "1.7.1"
|
||||
#define RUBY_RELEASE_DATE "2001-10-17"
|
||||
#define RUBY_RELEASE_DATE "2001-10-19"
|
||||
#define RUBY_VERSION_CODE 171
|
||||
#define RUBY_RELEASE_CODE 20011017
|
||||
#define RUBY_RELEASE_CODE 20011019
|
||||
|
|
Loading…
Reference in a new issue