nagachika	2016-05-04 02:46:58 +0900 (Wed, 04 May 2016)

  New Revision: 54899

  https://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=revision&revision=54899

  Log:
    merge revision(s) 54896,54897: [Backport #12343]
    
    * complex.c (rb_complex_set_imag): Fix to properly set imag
      of complex.
    
    * internal.h (RCOMPLEX_SET_IMAG): undef RCOMPLEX_SET_IMAG
      instead of duplicated undef RCOMPLEX_SET_REAL.

  Modified directories:
    branches/ruby_2_3/
  Modified files:
    branches/ruby_2_3/ChangeLog
    branches/ruby_2_3/complex.c
    branches/ruby_2_3/internal.h
    branches/ruby_2_3/version.h
Index: ruby_2_3/ChangeLog
===================================================================
--- ruby_2_3/ChangeLog	(revision 54898)
+++ ruby_2_3/ChangeLog	(revision 54899)
@@ -1,3 +1,13 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_3/ChangeLog#L1
+Wed May  4 02:38:08 2016  Yuichiro Kaneko  <yui-knk@r...>
+
+	* internal.h (RCOMPLEX_SET_IMAG): undef RCOMPLEX_SET_IMAG
+	  instead of duplicated undef RCOMPLEX_SET_REAL.
+
+Wed May  4 02:38:08 2016  Yuichiro Kaneko  <yui-knk@r...>
+
+	* complex.c (rb_complex_set_imag): Fix to properly set imag
+	  of complex.
+
 Tue Apr 26 23:34:45 2016  CHIKANAGA Tomoyuki  <nagachika@r...>
 
 	* version.h: Bump versionto 2.3.2.
Index: ruby_2_3/internal.h
===================================================================
--- ruby_2_3/internal.h	(revision 54898)
+++ ruby_2_3/internal.h	(revision 54899)
@@ -407,7 +407,7 @@ struct RComplex { https://github.com/ruby/ruby/blob/trunk/ruby_2_3/internal.h#L407
 
 #ifdef RCOMPLEX_SET_REAL        /* shortcut macro for internal only */
 #undef RCOMPLEX_SET_REAL
-#undef RCOMPLEX_SET_REAL
+#undef RCOMPLEX_SET_IMAG
 #define RCOMPLEX_SET_REAL(cmp, r) RB_OBJ_WRITE((cmp), &((struct RComplex *)(cmp))->real,(r))
 #define RCOMPLEX_SET_IMAG(cmp, i) RB_OBJ_WRITE((cmp), &((struct RComplex *)(cmp))->imag,(i))
 #endif
Index: ruby_2_3/version.h
===================================================================
--- ruby_2_3/version.h	(revision 54898)
+++ ruby_2_3/version.h	(revision 54899)
@@ -1,10 +1,10 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_3/version.h#L1
 #define RUBY_VERSION "2.3.2"
-#define RUBY_RELEASE_DATE "2016-04-26"
-#define RUBY_PATCHLEVEL 113
+#define RUBY_RELEASE_DATE "2016-05-04"
+#define RUBY_PATCHLEVEL 114
 
 #define RUBY_RELEASE_YEAR 2016
-#define RUBY_RELEASE_MONTH 4
-#define RUBY_RELEASE_DAY 26
+#define RUBY_RELEASE_MONTH 5
+#define RUBY_RELEASE_DAY 4
 
 #include "ruby/version.h"
 
Index: ruby_2_3/complex.c
===================================================================
--- ruby_2_3/complex.c	(revision 54898)
+++ ruby_2_3/complex.c	(revision 54899)
@@ -1414,7 +1414,7 @@ rb_complex_set_real(VALUE cmp, VALUE r) https://github.com/ruby/ruby/blob/trunk/ruby_2_3/complex.c#L1414
 VALUE
 rb_complex_set_imag(VALUE cmp, VALUE i)
 {
-    RCOMPLEX_SET_REAL(cmp, i);
+    RCOMPLEX_SET_IMAG(cmp, i);
     return cmp;
 }
 

Property changes on: ruby_2_3
___________________________________________________________________
Modified: svn:mergeinfo
   Merged /trunk:r54896-54897


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