summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorshyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2007-08-15 20:56:06 (GMT)
committershyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2007-08-15 20:56:06 (GMT)
commitad88684786075a5da432cf372dabc6a03427853c (patch)
tree3c1d97ef78a7575df897d7f148f28a3ca75871cd
parent43ee6d49174a82ab39c0522b3ec4d0e331fd63ba (diff)
parentede8000e64f997af26950e6f3ab2108127ed02a4 (diff)
sorry. I made wrong tags.v1_8_5_67
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/tags/v1_8_5_67@12997 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog5
-rw-r--r--struct.c7
-rw-r--r--version.h2
3 files changed, 4 insertions, 10 deletions
diff --git a/ChangeLog b/ChangeLog
index 7af1e65..5f5a850 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,8 +1,3 @@
-Thu Aug 16 04:53:21 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * struct.c (rb_struct_init_copy): disallow changing the size.
- [ruby-dev:31168]
-
Thu Aug 16 04:52:11 2007 NAKAMURA, Hiroshi <nahi@ruby-lang.org>
* random.c: documentation fix. srand(0) initializes PRNG with '0',
diff --git a/struct.c b/struct.c
index 0dd5aba..45797c8 100644
--- a/struct.c
+++ b/struct.c
@@ -252,7 +252,7 @@ rb_struct_define(name, va_alist)
ary = rb_ary_new();
va_init_list(ar, name);
- while ((mem = va_arg(ar, char*)) != 0) {
+ while (mem = va_arg(ar, char*)) {
ID slot = rb_intern(mem);
rb_ary_push(ary, ID2SYM(slot));
}
@@ -557,9 +557,8 @@ rb_struct_init_copy(copy, s)
if (!rb_obj_is_instance_of(s, rb_obj_class(copy))) {
rb_raise(rb_eTypeError, "wrong argument class");
}
- if (RSTRUCT(copy)->len != RSTRUCT(s)->len) {
- rb_raise(rb_eTypeError, "struct size mismatch");
- }
+ RSTRUCT(copy)->ptr = ALLOC_N(VALUE, RSTRUCT(s)->len);
+ RSTRUCT(copy)->len = RSTRUCT(s)->len;
MEMCPY(RSTRUCT(copy)->ptr, RSTRUCT(s)->ptr, VALUE, RSTRUCT(copy)->len);
return copy;
diff --git a/version.h b/version.h
index ccd6a3a..f701d93 100644
--- a/version.h
+++ b/version.h
@@ -2,7 +2,7 @@
#define RUBY_RELEASE_DATE "2007-08-16"
#define RUBY_VERSION_CODE 185
#define RUBY_RELEASE_CODE 20070816
-#define RUBY_PATCHLEVEL 68
+#define RUBY_PATCHLEVEL 67
#define RUBY_VERSION_MAJOR 1
#define RUBY_VERSION_MINOR 8