usa	2016-06-10 15:38:57 +0900 (Fri, 10 Jun 2016)

  New Revision: 55348

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

  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_2/
  Modified files:
    branches/ruby_2_2/ChangeLog
    branches/ruby_2_2/complex.c
    branches/ruby_2_2/internal.h
    branches/ruby_2_2/version.h
Index: ruby_2_2/internal.h
===================================================================
--- ruby_2_2/internal.h	(revision 55347)
+++ ruby_2_2/internal.h	(revision 55348)
@@ -453,7 +453,7 @@ struct RComplex { https://github.com/ruby/ruby/blob/trunk/ruby_2_2/internal.h#L453
 
 #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_2/version.h
===================================================================
--- ruby_2_2/version.h	(revision 55347)
+++ ruby_2_2/version.h	(revision 55348)
@@ -1,6 +1,6 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_2/version.h#L1
 #define RUBY_VERSION "2.2.6"
 #define RUBY_RELEASE_DATE "2016-06-10"
-#define RUBY_PATCHLEVEL 323
+#define RUBY_PATCHLEVEL 324
 
 #define RUBY_RELEASE_YEAR 2016
 #define RUBY_RELEASE_MONTH 6
Index: ruby_2_2/complex.c
===================================================================
--- ruby_2_2/complex.c	(revision 55347)
+++ ruby_2_2/complex.c	(revision 55348)
@@ -1351,7 +1351,7 @@ rb_complex_set_real(VALUE cmp, VALUE r) https://github.com/ruby/ruby/blob/trunk/ruby_2_2/complex.c#L1351
 VALUE
 rb_complex_set_imag(VALUE cmp, VALUE i)
 {
-    RCOMPLEX_SET_REAL(cmp, i);
+    RCOMPLEX_SET_IMAG(cmp, i);
     return cmp;
 }
 
Index: ruby_2_2/ChangeLog
===================================================================
--- ruby_2_2/ChangeLog	(revision 55347)
+++ ruby_2_2/ChangeLog	(revision 55348)
@@ -1,3 +1,13 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_2/ChangeLog#L1
+Fri Jun 10 15:37:25 2016  Yuichiro Kaneko  <yui-knk@r...>
+
+	* internal.h (RCOMPLEX_SET_IMAG): undef RCOMPLEX_SET_IMAG
+	  instead of duplicated undef RCOMPLEX_SET_REAL.
+
+Fri Jun 10 15:37:25 2016  Yuichiro Kaneko  <yui-knk@r...>
+
+	* complex.c (rb_complex_set_imag): Fix to properly set imag
+	  of complex.
+
 Fri Jun 10 15:05:41 2016  NAKAMURA Usaku  <usa@r...>
 
 	* win32/win32.c, include/ruby/win32.h (rb_w32_utruncate): implements new

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


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