Merge pull request #5204 from RobberPhex/master

juliantaylor · juliantaylor · commit 555d803792a9 · 2014-10-21T22:10:14.000+02:00
fixed #4896 (fails to build with MSVC 2013)
diff --git a/numpy/core/src/npymath/npy_math_complex.c.src b/numpy/core/src/npymath/npy_math_complex.c.src
@@ -247,7 +247,8 @@
 #ifdef HAVE_@KIND@@C@
 @type@ npy_@kind@@c@(@ctype@ z)
 {
-    __@ctype@_to_c99_cast z1 = {z};
+    __@ctype@_to_c99_cast z1;
+    z1.npy_z = z;
     return @kind@@c@(z1.c99_z);
 }
 #endif
@@ -260,8 +261,9 @@
 #ifdef HAVE_@KIND@@C@
 @ctype@ npy_@kind@@c@(@ctype@ z)
 {
-    __@ctype@_to_c99_cast z1 = {z};
+    __@ctype@_to_c99_cast z1;
     __@ctype@_to_c99_cast ret;
+    z1.npy_z = z;
     ret.c99_z = @kind@@c@(z1.c99_z);
     return ret.npy_z;
 }
@@ -275,9 +277,11 @@
 #ifdef HAVE_@KIND@@C@
 @ctype@ npy_@kind@@c@(@ctype@ x, @ctype@ y)
 {
-    __@ctype@_to_c99_cast xcast = {x};
-    __@ctype@_to_c99_cast ycast = {y};
+    __@ctype@_to_c99_cast xcast;
+    __@ctype@_to_c99_cast ycast;
     __@ctype@_to_c99_cast ret;
+    xcast.npy_z = x;
+    ycast.npy_z = y;
     ret.c99_z = @kind@@c@(xcast.c99_z, ycast.c99_z);
     return ret.npy_z;
 }
diff --git a/numpy/core/src/npymath/npy_math_private.h b/numpy/core/src/npymath/npy_math_private.h
@@ -485,6 +485,24 @@ do {                                                            \
  * support is available
  */
 #ifdef NPY_USE_C99_COMPLEX
+
+/* Microsoft C defines _MSC_VER */
+#ifdef _MSC_VER
+typedef union {
+        npy_cdouble npy_z;
+        _Dcomplex c99_z;
+} __npy_cdouble_to_c99_cast;
+
+typedef union {
+        npy_cfloat npy_z;
+        _Fcomplex c99_z;
+} __npy_cfloat_to_c99_cast;
+
+typedef union {
+        npy_clongdouble npy_z;
+        _Lcomplex c99_z;
+} __npy_clongdouble_to_c99_cast;
+#else /* !_MSC_VER */
 typedef union {
         npy_cdouble npy_z;
         complex double c99_z;
@@ -499,7 +517,9 @@ typedef union {
         npy_clongdouble npy_z;
         complex long double c99_z;
 } __npy_clongdouble_to_c99_cast;
-#else
+#endif /* !_MSC_VER */
+
+#else /* !NPY_USE_C99_COMPLEX */
 typedef union {
         npy_cdouble npy_z;
         npy_cdouble c99_z;
@@ -514,6 +534,6 @@ typedef union {
         npy_clongdouble npy_z;
         npy_clongdouble c99_z;
 } __npy_clongdouble_to_c99_cast;
-#endif
+#endif /* !NPY_USE_C99_COMPLEX */
 
 #endif /* !_NPY_MATH_PRIVATE_H_ */

Original file line number	Diff line number	Diff line change
`@@ -247,7 +247,8 @@`
`247`	`247`	`#ifdef HAVE_@KIND@@C@`
`248`	`248`	`@type@ npy_@kind@@c@(@ctype@ z)`
`249`	`249`	`{`
`250`		`- __@ctype@_to_c99_cast z1 = {z};`
	`250`	`+ __@ctype@_to_c99_cast z1;`
	`251`	`+ z1.npy_z = z;`
`251`	`252`	`return @kind@@c@(z1.c99_z);`
`252`	`253`	`}`
`253`	`254`	`#endif`
`@@ -260,8 +261,9 @@`
`260`	`261`	`#ifdef HAVE_@KIND@@C@`
`261`	`262`	`@ctype@ npy_@kind@@c@(@ctype@ z)`
`262`	`263`	`{`
`263`		`- __@ctype@_to_c99_cast z1 = {z};`
	`264`	`+ __@ctype@_to_c99_cast z1;`
`264`	`265`	`__@ctype@_to_c99_cast ret;`
	`266`	`+ z1.npy_z = z;`
`265`	`267`	`ret.c99_z = @kind@@c@(z1.c99_z);`
`266`	`268`	`return ret.npy_z;`
`267`	`269`	`}`
`@@ -275,9 +277,11 @@`
`275`	`277`	`#ifdef HAVE_@KIND@@C@`
`276`	`278`	`@ctype@ npy_@kind@@c@(@ctype@ x, @ctype@ y)`
`277`	`279`	`{`
`278`		`- __@ctype@_to_c99_cast xcast = {x};`
`279`		`- __@ctype@_to_c99_cast ycast = {y};`
	`280`	`+ __@ctype@_to_c99_cast xcast;`
	`281`	`+ __@ctype@_to_c99_cast ycast;`
`280`	`282`	`__@ctype@_to_c99_cast ret;`
	`283`	`+ xcast.npy_z = x;`
	`284`	`+ ycast.npy_z = y;`
`281`	`285`	`ret.c99_z = @kind@@c@(xcast.c99_z, ycast.c99_z);`
`282`	`286`	`return ret.npy_z;`
`283`	`287`	`}`