@@ -29,7 +29,7 @@ dtypes = [('Float64', 'float64', 'float64_t'),
29
29
30
30
ctypedef struct {{name}}VectorData:
31
31
{{arg}} *data
32
- size_t n, m
32
+ Py_ssize_t n, m
33
33
34
34
{{endif}}
35
35
@@ -147,7 +147,7 @@ cdef class StringVector:
147
147
cdef resize(self):
148
148
cdef:
149
149
char **orig_data
150
- size_t i, m
150
+ Py_ssize_t i, m
151
151
152
152
m = self.data.m
153
153
self.data.m = max(self.data.m * 4, _INIT_VEC_CAP)
@@ -172,7 +172,7 @@ cdef class StringVector:
172
172
def to_array(self):
173
173
cdef:
174
174
ndarray ao
175
- size_t n
175
+ Py_ssize_t n
176
176
object val
177
177
178
178
ao = np.empty(self.data.n, dtype=np.object)
@@ -198,7 +198,7 @@ cdef class ObjectVector:
198
198
199
199
cdef:
200
200
PyObject **data
201
- size_t n, m
201
+ Py_ssize_t n, m
202
202
ndarray ao
203
203
bint external_view_exists
204
204
@@ -281,7 +281,7 @@ cdef class {{name}}HashTable(HashTable):
281
281
def sizeof(self, deep=False):
282
282
""" return the size of my table in bytes """
283
283
return self.table.n_buckets * (sizeof({{dtype}}_t) + # keys
284
- sizeof(size_t ) + # vals
284
+ sizeof(Py_ssize_t ) + # vals
285
285
sizeof(uint32_t)) # flags
286
286
287
287
cpdef get_item(self, {{dtype}}_t val):
@@ -522,13 +522,13 @@ cdef class StringHashTable(HashTable):
522
522
def sizeof(self, deep=False):
523
523
""" return the size of my table in bytes """
524
524
return self.table.n_buckets * (sizeof(char *) + # keys
525
- sizeof(size_t ) + # vals
525
+ sizeof(Py_ssize_t ) + # vals
526
526
sizeof(uint32_t)) # flags
527
527
528
528
cpdef get_item(self, object val):
529
529
cdef:
530
530
khiter_t k
531
- char *v
531
+ const char *v
532
532
v = util.get_c_string(val)
533
533
534
534
k = kh_get_str(self.table, v)
@@ -541,7 +541,7 @@ cdef class StringHashTable(HashTable):
541
541
cdef:
542
542
khiter_t k
543
543
int ret = 0
544
- char *v
544
+ const char *v
545
545
546
546
v = util.get_c_string(val)
547
547
@@ -560,10 +560,10 @@ cdef class StringHashTable(HashTable):
560
560
int64_t *resbuf = <int64_t*> labels.data
561
561
khiter_t k
562
562
kh_str_t *table = self.table
563
- char *v
564
- char **vecs
563
+ const char *v
564
+ const char **vecs
565
565
566
- vecs = <char **> malloc(n * sizeof(char *))
566
+ vecs = <const char **> malloc(n * sizeof(char *))
567
567
for i in range(n):
568
568
val = values[i]
569
569
v = util.get_c_string(val)
@@ -589,10 +589,10 @@ cdef class StringHashTable(HashTable):
589
589
object val
590
590
ObjectVector uniques
591
591
khiter_t k
592
- char *v
593
- char **vecs
592
+ const char *v
593
+ const char **vecs
594
594
595
- vecs = <char **> malloc(n * sizeof(char *))
595
+ vecs = <const char **> malloc(n * sizeof(char *))
596
596
uindexer = np.empty(n, dtype=np.int64)
597
597
for i in range(n):
598
598
val = values[i]
@@ -627,7 +627,7 @@ cdef class StringHashTable(HashTable):
627
627
Py_ssize_t i, n = len(values)
628
628
int ret = 0
629
629
object val
630
- char *v
630
+ const char *v
631
631
khiter_t k
632
632
int64_t[:] locs = np.empty(n, dtype=np.int64)
633
633
@@ -660,12 +660,12 @@ cdef class StringHashTable(HashTable):
660
660
Py_ssize_t i, n = len(values)
661
661
int ret = 0
662
662
object val
663
- char *v
664
- char **vecs
663
+ const char *v
664
+ const char **vecs
665
665
khiter_t k
666
666
667
667
# these by-definition *must* be strings
668
- vecs = <char **> malloc(n * sizeof(char *))
668
+ vecs = <const char **> malloc(n * sizeof(char *))
669
669
for i in range(n):
670
670
val = values[i]
671
671
@@ -693,8 +693,8 @@ cdef class StringHashTable(HashTable):
693
693
Py_ssize_t idx, count = count_prior
694
694
int ret = 0
695
695
object val
696
- char *v
697
- char **vecs
696
+ const char *v
697
+ const char **vecs
698
698
khiter_t k
699
699
bint use_na_value
700
700
@@ -705,7 +705,7 @@ cdef class StringHashTable(HashTable):
705
705
706
706
# pre-filter out missing
707
707
# and assign pointers
708
- vecs = <char **> malloc(n * sizeof(char *))
708
+ vecs = <const char **> malloc(n * sizeof(char *))
709
709
for i in range(n):
710
710
val = values[i]
711
711
@@ -769,7 +769,7 @@ cdef class PyObjectHashTable(HashTable):
769
769
def sizeof(self, deep=False):
770
770
""" return the size of my table in bytes """
771
771
return self.table.n_buckets * (sizeof(PyObject *) + # keys
772
- sizeof(size_t ) + # vals
772
+ sizeof(Py_ssize_t ) + # vals
773
773
sizeof(uint32_t)) # flags
774
774
775
775
cpdef get_item(self, object val):
0 commit comments