Skip to content

Fix 32-bit builds by correctly using intp_t instead of int64_t for numpy.searchsorted result #24621

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

Merged
jreback merged 1 commit into from
Jan 4, 2019
Merged

Fix 32-bit builds by correctly using intp_t instead of int64_t for numpy.searchsorted result #24621

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
4 changes: 2 additions & 2 deletions pandas/_libs/tslibs/conversion.pyx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import cython

import numpy as np
cimport numpy as cnp
from numpy cimport uint8_t, int64_t, int32_t, ndarray
from numpy cimport uint8_t, int64_t, int32_t, intp_t, ndarray
cnp.import_array()

import pytz
Expand Down Expand Up @@ -639,7 +639,7 @@ cdef inline int64_t[:] _tz_convert_dst(int64_t[:] values, tzinfo tz,
cdef:
Py_ssize_t n = len(values)
Py_ssize_t i
int64_t[:] pos
intp_t[:] pos
int64_t[:] result = np.empty(n, dtype=np.int64)
ndarray[int64_t] trans
int64_t[:] deltas
Expand Down