naruse	2014-03-01 18:02:36 +0900 (Sat, 01 Mar 2014)

  New Revision: 45227

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=45227

  Log:
    merge revision(s) 44370: [Backport #9576]
    
    hash.c: extra states
    
    * hash.c (rb_hash_reject): use words "extra states".

  Modified directories:
    branches/ruby_2_1/
  Modified files:
    branches/ruby_2_1/hash.c
    branches/ruby_2_1/version.h
Index: ruby_2_1/hash.c
===================================================================
--- ruby_2_1/hash.c	(revision 45226)
+++ ruby_2_1/hash.c	(revision 45227)
@@ -1178,7 +1178,7 @@ rb_hash_reject(VALUE hash) https://github.com/ruby/ruby/blob/trunk/ruby_2_1/hash.c#L1178
 #endif
 	}
     }
-#if HASH_REJECT_COPY_MISC_ATTRIBUTES
+#if HASH_REJECT_COPY_EXTRA_STATES
     result = rb_hash_dup_empty(hash);
 #else
     result = rb_hash_new();
Index: ruby_2_1/version.h
===================================================================
--- ruby_2_1/version.h	(revision 45226)
+++ ruby_2_1/version.h	(revision 45227)
@@ -1,6 +1,6 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_1/version.h#L1
 #define RUBY_VERSION "2.1.2"
 #define RUBY_RELEASE_DATE "2014-03-01"
-#define RUBY_PATCHLEVEL 78
+#define RUBY_PATCHLEVEL 79
 
 #define RUBY_RELEASE_YEAR 2014
 #define RUBY_RELEASE_MONTH 3

Property changes on: ruby_2_1
___________________________________________________________________
Modified: svn:mergeinfo
   Merged /trunk:r44370


--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/