diff options
| author | Paul Sherwood <paul.sherwood@codethink.co.uk> | 2014-04-20 09:01:04 +0000 |
|---|---|---|
| committer | Paul Sherwood <paul.sherwood@codethink.co.uk> | 2014-04-20 09:01:04 +0000 |
| commit | 6ecf40e1fa1b2c55f63d0ccb46bce2fca73b40ad (patch) | |
| tree | 368a0326bcf36bc7e06cbbe7a1d55b752afd86ba /object.c | |
| parent | cb3ea602294b5038b5f7ac21d3875a2b52342956 (diff) | |
| parent | 680d09b61ea7d850e27944311723a40c596e5d95 (diff) | |
| download | ruby-baserock/ps/proto-web-system.tar.gz | |
Merge commit '680d09' into baserock/ps/proto-web-systembaserock/ps/proto-web-system
Diffstat (limited to 'object.c')
| -rw-r--r-- | object.c | 5 |
1 files changed, 3 insertions, 2 deletions
@@ -285,7 +285,7 @@ rb_obj_clone(VALUE obj) } clone = rb_obj_alloc(rb_obj_class(obj)); RBASIC(clone)->klass = rb_singleton_class_clone(obj); - RBASIC(clone)->flags = (RBASIC(obj)->flags | FL_TEST(clone, FL_TAINT) | FL_TEST(clone, FL_UNTRUSTED)) & ~(FL_FREEZE|FL_FINALIZE|FL_MARK); + RBASIC(clone)->flags = (RBASIC(obj)->flags | FL_TEST(clone, FL_TAINT) | FL_TEST(clone, FL_UNTRUSTED)) & ~(FL_FREEZE|FL_FINALIZE|FL_MARK) | (RBASIC(clone)->flags&FL_MARK); init_copy(clone, obj); rb_funcall(clone, id_init_clone, 1, obj); RBASIC(clone)->flags |= RBASIC(obj)->flags & FL_FREEZE; @@ -1234,7 +1234,8 @@ rb_obj_not_match(VALUE obj1, VALUE obj2) * call-seq: * obj <=> other -> 0 or nil * - * Returns 0 if obj === other, otherwise nil. + * Returns 0 if +obj+ and +other+ are the same object + * or <code>obj == other</code>, otherwise nil. */ static VALUE rb_obj_cmp(VALUE obj1, VALUE obj2) |