From bafb881c1f22781aac347cdabb845798a7753180 Mon Sep 17 00:00:00 2001 From: nobu Date: Tue, 2 Feb 2010 02:14:00 +0000 Subject: * lib/delegate.rb (Delegator#marshal_dump): exclude delegator-specific instance variables. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@26539 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 5 +++++ lib/delegate.rb | 4 ++-- version.h | 4 ++-- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index c29a27ca72..a2f67e59f1 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Tue Feb 2 11:13:56 2010 Nobuyoshi Nakada + + * lib/delegate.rb (Delegator#marshal_dump): exclude + delegator-specific instance variables. + Mon Feb 1 21:26:41 2010 Yusuke Endoh * lib/matrix.rb (Vector#each2): returns a self. [ruby-dev:40241] diff --git a/lib/delegate.rb b/lib/delegate.rb index 849cad58a8..b1f79582f4 100644 --- a/lib/delegate.rb +++ b/lib/delegate.rb @@ -183,10 +183,10 @@ class Delegator # Serialization support for the object returned by \_\_getobj\_\_. def marshal_dump + ivars = instance_variables.reject {|var| /\A@delegate_/ =~ var} [ :__v2__, - instance_variables, - instance_variables.map{|var| instance_variable_get(var)}, + ivars, ivars.map{|var| instance_variable_get(var)}, __getobj__ ] end diff --git a/version.h b/version.h index a327629921..9900348d45 100644 --- a/version.h +++ b/version.h @@ -1,5 +1,5 @@ #define RUBY_VERSION "1.9.2" -#define RUBY_RELEASE_DATE "2010-02-01" +#define RUBY_RELEASE_DATE "2010-02-02" #define RUBY_PATCHLEVEL -1 #define RUBY_BRANCH_NAME "trunk" @@ -8,7 +8,7 @@ #define RUBY_VERSION_TEENY 1 #define RUBY_RELEASE_YEAR 2010 #define RUBY_RELEASE_MONTH 2 -#define RUBY_RELEASE_DAY 1 +#define RUBY_RELEASE_DAY 2 #include "ruby/version.h" -- cgit v1.2.3