diff options
| author | David Cournapeau <cournape@gmail.com> | 2009-07-20 08:28:18 +0000 |
|---|---|---|
| committer | David Cournapeau <cournape@gmail.com> | 2009-07-20 08:28:18 +0000 |
| commit | 3297529a67c57db3b7bb7c8d58f8d4829a23baf1 (patch) | |
| tree | dd9ee5ffb67a606507b49b82ccfb7ba454804472 /numpy | |
| parent | 0ccbd222ae8e5144931e8ceeaaad77caaa205fac (diff) | |
| download | numpy-3297529a67c57db3b7bb7c8d58f8d4829a23baf1.tar.gz | |
BUG: fix logic OR vs. bitwise OR.
Diffstat (limited to 'numpy')
| -rw-r--r-- | numpy/core/src/npymath/npy_math.c.src | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/numpy/core/src/npymath/npy_math.c.src b/numpy/core/src/npymath/npy_math.c.src index 4af5a8859..e6eba425f 100644 --- a/numpy/core/src/npymath/npy_math.c.src +++ b/numpy/core/src/npymath/npy_math.c.src @@ -100,7 +100,7 @@ double npy_hypot(double x, double y) /* Handle the case where x or y is a NaN */ if (npy_isnan(x * y)) { - if (npy_isinf(x) | npy_isinf(y)) { + if (npy_isinf(x) || npy_isinf(y)) { return NPY_INFINITY; } else { return NPY_NAN; |