diff options
| author | Charles Harris <charlesr.harris@gmail.com> | 2018-10-04 11:02:22 -0600 |
|---|---|---|
| committer | Charles Harris <charlesr.harris@gmail.com> | 2018-10-04 11:02:22 -0600 |
| commit | 8548076b2108db7d98dfa14f5c52092764ad77b4 (patch) | |
| tree | d6c03880cb6190cea8ac94e68feb1ec5332b6298 | |
| parent | 632f14a8a594d3cff5fc0d1074cb6e61858bf3f3 (diff) | |
| download | numpy-8548076b2108db7d98dfa14f5c52092764ad77b4.tar.gz | |
MAINT: Blacklist some MSVC complex functions.
Backport of #12079.
Extend the blacklist to MSVC 2017 and add functions
- CSQRT
- CSQRTF
- CSQRTL
- CLOG
- CLOGF
- CLOGL
- CACOS
- CACOSF
- CACOSL
- CACOSH
- CACOSHF
- CACOSHL
See comment from @cgholke at issue #11855. Closes #12078.
| -rw-r--r-- | numpy/core/src/private/npy_config.h | 15 |
1 files changed, 14 insertions, 1 deletions
diff --git a/numpy/core/src/private/npy_config.h b/numpy/core/src/private/npy_config.h index 107b3cb5b..eabcf99da 100644 --- a/numpy/core/src/private/npy_config.h +++ b/numpy/core/src/private/npy_config.h @@ -45,7 +45,7 @@ #endif -#if defined(_MSC_VER) && (_MSC_VER == 1900) +#if defined(_MSC_VER) && (_MSC_VER >= 1900) #undef HAVE_CASIN #undef HAVE_CASINF @@ -60,6 +60,19 @@ #undef HAVE_CATANHF #undef HAVE_CATANHL +#undef HAVE_CSQRT +#undef HAVE_CSQRTF +#undef HAVE_CSQRTL +#undef HAVE_CLOG +#undef HAVE_CLOGF +#undef HAVE_CLOGL +#undef HAVE_CACOS +#undef HAVE_CACOSF +#undef HAVE_CACOSL +#undef HAVE_CACOSH +#undef HAVE_CACOSHF +#undef HAVE_CACOSHL + #endif /* MSVC _hypot messes with fp precision mode on 32-bit, see gh-9567 */ |