Thanks to visit codestin.com
Credit goes to github.com

Skip to content

fixed #4896 (fails to build with MSVC 2013) #5204

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
robberphex wants to merge 1 commit into from
Closed

fixed #4896 (fails to build with MSVC 2013) #5204

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 8 additions & 4 deletions numpy/core/src/npymath/npy_math_complex.c.src
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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;
}
Expand All @@ -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;
}
Expand Down
24 changes: 22 additions & 2 deletions numpy/core/src/npymath/npy_math_private.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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;
Expand All @@ -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_ */