diff options
| author | Charles Harris <charlesr.harris@gmail.com> | 2015-12-12 08:49:40 -0700 |
|---|---|---|
| committer | Charles Harris <charlesr.harris@gmail.com> | 2015-12-12 08:49:40 -0700 |
| commit | 7f2258dbec043f18d3cd746c8133ac3dd3a4a368 (patch) | |
| tree | 32e76247246f7795f7c5e65a35e04c9cdd712f2b | |
| parent | 9ba59e1174cfdc0cf29b654cf0bf49a59e1a3631 (diff) | |
| parent | c9cf216086502d3e38dc6b703fc9763525d83c66 (diff) | |
| download | numpy-7f2258dbec043f18d3cd746c8133ac3dd3a4a368.tar.gz | |
Merge pull request #6817 from cgohlke/patch-1
BUG: Disable 32-bit msvc9 compiler optimizations for npy_rint
| -rw-r--r-- | numpy/core/src/npymath/npy_math.c.src | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/numpy/core/src/npymath/npy_math.c.src b/numpy/core/src/npymath/npy_math.c.src index 7f62810d5..32fa41788 100644 --- a/numpy/core/src/npymath/npy_math.c.src +++ b/numpy/core/src/npymath/npy_math.c.src @@ -260,6 +260,9 @@ double npy_atanh(double x) #endif #ifndef HAVE_RINT +#if defined(_MSC_VER) && (_MSC_VER == 1500) && !defined(_WIN64) +#pragma optimize("", off) +#endif double npy_rint(double x) { double y, r; @@ -280,6 +283,9 @@ double npy_rint(double x) } return y; } +#if defined(_MSC_VER) && (_MSC_VER == 1500) && !defined(_WIN64) +#pragma optimize("", on) +#endif #endif #ifndef HAVE_TRUNC |