Skip to content

Commit 9c87a23

Browse files
jbrockmendelalanbato
authored andcommitted
BLD: fix inline warnings (pandas-dev#17528)
1 parent 483fd86 commit 9c87a23

File tree

5 files changed

+81
-81
lines changed

5 files changed

+81
-81
lines changed

pandas/_libs/parsers.pyx

+1-1
Original file line numberDiff line numberDiff line change
@@ -255,7 +255,7 @@ cdef extern from "parser/tokenizer.h":
255255

256256
# inline int to_complex(char *item, double *p_real,
257257
# double *p_imag, char sci, char decimal)
258-
inline int to_longlong(char *item, long long *p_value) nogil
258+
int to_longlong(char *item, long long *p_value) nogil
259259
# inline int to_longlong_thousands(char *item, long long *p_value,
260260
# char tsep)
261261
int to_boolean(const char *item, uint8_t *val) nogil

pandas/_libs/src/inference.pyx

+1-1
Original file line numberDiff line numberDiff line change
@@ -1015,7 +1015,7 @@ cpdef bint is_interval_array(ndarray[object] values):
10151015

10161016

10171017
cdef extern from "parse_helper.h":
1018-
inline int floatify(object, double *result, int *maybe_int) except -1
1018+
int floatify(object, double *result, int *maybe_int) except -1
10191019

10201020
# constants that will be compared to potentially arbitrarily large
10211021
# python int

pandas/_libs/src/khash.pxd

+56-56
Original file line numberDiff line numberDiff line change
@@ -11,13 +11,13 @@ cdef extern from "khash_python.h":
1111
PyObject **keys
1212
size_t *vals
1313

14-
inline kh_pymap_t* kh_init_pymap()
15-
inline void kh_destroy_pymap(kh_pymap_t*)
16-
inline void kh_clear_pymap(kh_pymap_t*)
17-
inline khint_t kh_get_pymap(kh_pymap_t*, PyObject*)
18-
inline void kh_resize_pymap(kh_pymap_t*, khint_t)
19-
inline khint_t kh_put_pymap(kh_pymap_t*, PyObject*, int*)
20-
inline void kh_del_pymap(kh_pymap_t*, khint_t)
14+
kh_pymap_t* kh_init_pymap()
15+
void kh_destroy_pymap(kh_pymap_t*)
16+
void kh_clear_pymap(kh_pymap_t*)
17+
khint_t kh_get_pymap(kh_pymap_t*, PyObject*)
18+
void kh_resize_pymap(kh_pymap_t*, khint_t)
19+
khint_t kh_put_pymap(kh_pymap_t*, PyObject*, int*)
20+
void kh_del_pymap(kh_pymap_t*, khint_t)
2121

2222
bint kh_exist_pymap(kh_pymap_t*, khiter_t)
2323

@@ -27,13 +27,13 @@ cdef extern from "khash_python.h":
2727
PyObject **keys
2828
size_t *vals
2929

30-
inline kh_pyset_t* kh_init_pyset()
31-
inline void kh_destroy_pyset(kh_pyset_t*)
32-
inline void kh_clear_pyset(kh_pyset_t*)
33-
inline khint_t kh_get_pyset(kh_pyset_t*, PyObject*)
34-
inline void kh_resize_pyset(kh_pyset_t*, khint_t)
35-
inline khint_t kh_put_pyset(kh_pyset_t*, PyObject*, int*)
36-
inline void kh_del_pyset(kh_pyset_t*, khint_t)
30+
kh_pyset_t* kh_init_pyset()
31+
void kh_destroy_pyset(kh_pyset_t*)
32+
void kh_clear_pyset(kh_pyset_t*)
33+
khint_t kh_get_pyset(kh_pyset_t*, PyObject*)
34+
void kh_resize_pyset(kh_pyset_t*, khint_t)
35+
khint_t kh_put_pyset(kh_pyset_t*, PyObject*, int*)
36+
void kh_del_pyset(kh_pyset_t*, khint_t)
3737

3838
bint kh_exist_pyset(kh_pyset_t*, khiter_t)
3939

@@ -45,13 +45,13 @@ cdef extern from "khash_python.h":
4545
kh_cstr_t *keys
4646
size_t *vals
4747

48-
inline kh_str_t* kh_init_str() nogil
49-
inline void kh_destroy_str(kh_str_t*) nogil
50-
inline void kh_clear_str(kh_str_t*) nogil
51-
inline khint_t kh_get_str(kh_str_t*, kh_cstr_t) nogil
52-
inline void kh_resize_str(kh_str_t*, khint_t) nogil
53-
inline khint_t kh_put_str(kh_str_t*, kh_cstr_t, int*) nogil
54-
inline void kh_del_str(kh_str_t*, khint_t) nogil
48+
kh_str_t* kh_init_str() nogil
49+
void kh_destroy_str(kh_str_t*) nogil
50+
void kh_clear_str(kh_str_t*) nogil
51+
khint_t kh_get_str(kh_str_t*, kh_cstr_t) nogil
52+
void kh_resize_str(kh_str_t*, khint_t) nogil
53+
khint_t kh_put_str(kh_str_t*, kh_cstr_t, int*) nogil
54+
void kh_del_str(kh_str_t*, khint_t) nogil
5555

5656
bint kh_exist_str(kh_str_t*, khiter_t) nogil
5757

@@ -61,13 +61,13 @@ cdef extern from "khash_python.h":
6161
int64_t *keys
6262
size_t *vals
6363

64-
inline kh_int64_t* kh_init_int64() nogil
65-
inline void kh_destroy_int64(kh_int64_t*) nogil
66-
inline void kh_clear_int64(kh_int64_t*) nogil
67-
inline khint_t kh_get_int64(kh_int64_t*, int64_t) nogil
68-
inline void kh_resize_int64(kh_int64_t*, khint_t) nogil
69-
inline khint_t kh_put_int64(kh_int64_t*, int64_t, int*) nogil
70-
inline void kh_del_int64(kh_int64_t*, khint_t) nogil
64+
kh_int64_t* kh_init_int64() nogil
65+
void kh_destroy_int64(kh_int64_t*) nogil
66+
void kh_clear_int64(kh_int64_t*) nogil
67+
khint_t kh_get_int64(kh_int64_t*, int64_t) nogil
68+
void kh_resize_int64(kh_int64_t*, khint_t) nogil
69+
khint_t kh_put_int64(kh_int64_t*, int64_t, int*) nogil
70+
void kh_del_int64(kh_int64_t*, khint_t) nogil
7171

7272
bint kh_exist_int64(kh_int64_t*, khiter_t) nogil
7373

@@ -79,13 +79,13 @@ cdef extern from "khash_python.h":
7979
khuint64_t *keys
8080
size_t *vals
8181

82-
inline kh_uint64_t* kh_init_uint64() nogil
83-
inline void kh_destroy_uint64(kh_uint64_t*) nogil
84-
inline void kh_clear_uint64(kh_uint64_t*) nogil
85-
inline khint_t kh_get_uint64(kh_uint64_t*, int64_t) nogil
86-
inline void kh_resize_uint64(kh_uint64_t*, khint_t) nogil
87-
inline khint_t kh_put_uint64(kh_uint64_t*, int64_t, int*) nogil
88-
inline void kh_del_uint64(kh_uint64_t*, khint_t) nogil
82+
kh_uint64_t* kh_init_uint64() nogil
83+
void kh_destroy_uint64(kh_uint64_t*) nogil
84+
void kh_clear_uint64(kh_uint64_t*) nogil
85+
khint_t kh_get_uint64(kh_uint64_t*, int64_t) nogil
86+
void kh_resize_uint64(kh_uint64_t*, khint_t) nogil
87+
khint_t kh_put_uint64(kh_uint64_t*, int64_t, int*) nogil
88+
void kh_del_uint64(kh_uint64_t*, khint_t) nogil
8989

9090
bint kh_exist_uint64(kh_uint64_t*, khiter_t) nogil
9191

@@ -95,13 +95,13 @@ cdef extern from "khash_python.h":
9595
float64_t *keys
9696
size_t *vals
9797

98-
inline kh_float64_t* kh_init_float64() nogil
99-
inline void kh_destroy_float64(kh_float64_t*) nogil
100-
inline void kh_clear_float64(kh_float64_t*) nogil
101-
inline khint_t kh_get_float64(kh_float64_t*, float64_t) nogil
102-
inline void kh_resize_float64(kh_float64_t*, khint_t) nogil
103-
inline khint_t kh_put_float64(kh_float64_t*, float64_t, int*) nogil
104-
inline void kh_del_float64(kh_float64_t*, khint_t) nogil
98+
kh_float64_t* kh_init_float64() nogil
99+
void kh_destroy_float64(kh_float64_t*) nogil
100+
void kh_clear_float64(kh_float64_t*) nogil
101+
khint_t kh_get_float64(kh_float64_t*, float64_t) nogil
102+
void kh_resize_float64(kh_float64_t*, khint_t) nogil
103+
khint_t kh_put_float64(kh_float64_t*, float64_t, int*) nogil
104+
void kh_del_float64(kh_float64_t*, khint_t) nogil
105105

106106
bint kh_exist_float64(kh_float64_t*, khiter_t) nogil
107107

@@ -111,13 +111,13 @@ cdef extern from "khash_python.h":
111111
int32_t *keys
112112
size_t *vals
113113

114-
inline kh_int32_t* kh_init_int32() nogil
115-
inline void kh_destroy_int32(kh_int32_t*) nogil
116-
inline void kh_clear_int32(kh_int32_t*) nogil
117-
inline khint_t kh_get_int32(kh_int32_t*, int32_t) nogil
118-
inline void kh_resize_int32(kh_int32_t*, khint_t) nogil
119-
inline khint_t kh_put_int32(kh_int32_t*, int32_t, int*) nogil
120-
inline void kh_del_int32(kh_int32_t*, khint_t) nogil
114+
kh_int32_t* kh_init_int32() nogil
115+
void kh_destroy_int32(kh_int32_t*) nogil
116+
void kh_clear_int32(kh_int32_t*) nogil
117+
khint_t kh_get_int32(kh_int32_t*, int32_t) nogil
118+
void kh_resize_int32(kh_int32_t*, khint_t) nogil
119+
khint_t kh_put_int32(kh_int32_t*, int32_t, int*) nogil
120+
void kh_del_int32(kh_int32_t*, khint_t) nogil
121121

122122
bint kh_exist_int32(kh_int32_t*, khiter_t) nogil
123123

@@ -129,12 +129,12 @@ cdef extern from "khash_python.h":
129129
kh_cstr_t *keys
130130
PyObject **vals
131131

132-
inline kh_strbox_t* kh_init_strbox() nogil
133-
inline void kh_destroy_strbox(kh_strbox_t*) nogil
134-
inline void kh_clear_strbox(kh_strbox_t*) nogil
135-
inline khint_t kh_get_strbox(kh_strbox_t*, kh_cstr_t) nogil
136-
inline void kh_resize_strbox(kh_strbox_t*, khint_t) nogil
137-
inline khint_t kh_put_strbox(kh_strbox_t*, kh_cstr_t, int*) nogil
138-
inline void kh_del_strbox(kh_strbox_t*, khint_t) nogil
132+
kh_strbox_t* kh_init_strbox() nogil
133+
void kh_destroy_strbox(kh_strbox_t*) nogil
134+
void kh_clear_strbox(kh_strbox_t*) nogil
135+
khint_t kh_get_strbox(kh_strbox_t*, kh_cstr_t) nogil
136+
void kh_resize_strbox(kh_strbox_t*, khint_t) nogil
137+
khint_t kh_put_strbox(kh_strbox_t*, kh_cstr_t, int*) nogil
138+
void kh_del_strbox(kh_strbox_t*, khint_t) nogil
139139

140140
bint kh_exist_strbox(kh_strbox_t*, khiter_t) nogil

pandas/_libs/src/skiplist.pxd

+5-5
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,9 @@ cdef extern from "skiplist.h":
1414
int size
1515
int maxlevels
1616

17-
inline skiplist_t* skiplist_init(int) nogil
18-
inline void skiplist_destroy(skiplist_t*) nogil
19-
inline double skiplist_get(skiplist_t*, int, int*) nogil
20-
inline int skiplist_insert(skiplist_t*, double) nogil
21-
inline int skiplist_remove(skiplist_t*, double) nogil
17+
skiplist_t* skiplist_init(int) nogil
18+
void skiplist_destroy(skiplist_t*) nogil
19+
double skiplist_get(skiplist_t*, int, int*) nogil
20+
int skiplist_insert(skiplist_t*, double) nogil
21+
int skiplist_remove(skiplist_t*, double) nogil
2222

pandas/_libs/src/util.pxd

+18-18
Original file line numberDiff line numberDiff line change
@@ -3,26 +3,26 @@ cimport numpy as cnp
33
cimport cpython
44

55
cdef extern from "numpy_helper.h":
6-
inline void set_array_owndata(ndarray ao)
7-
inline void set_array_not_contiguous(ndarray ao)
8-
9-
inline int is_integer_object(object)
10-
inline int is_float_object(object)
11-
inline int is_complex_object(object)
12-
inline int is_bool_object(object)
13-
inline int is_string_object(object)
14-
inline int is_datetime64_object(object)
15-
inline int is_timedelta64_object(object)
16-
inline int assign_value_1d(ndarray, Py_ssize_t, object) except -1
17-
inline cnp.int64_t get_nat()
18-
inline object get_value_1d(ndarray, Py_ssize_t)
19-
inline int floatify(object, double*) except -1
20-
inline char *get_c_string(object) except NULL
21-
inline object char_to_string(char*)
22-
inline void transfer_object_column(char *dst, char *src, size_t stride,
6+
void set_array_owndata(ndarray ao)
7+
void set_array_not_contiguous(ndarray ao)
8+
9+
int is_integer_object(object)
10+
int is_float_object(object)
11+
int is_complex_object(object)
12+
int is_bool_object(object)
13+
int is_string_object(object)
14+
int is_datetime64_object(object)
15+
int is_timedelta64_object(object)
16+
int assign_value_1d(ndarray, Py_ssize_t, object) except -1
17+
cnp.int64_t get_nat()
18+
object get_value_1d(ndarray, Py_ssize_t)
19+
int floatify(object, double*) except -1
20+
char *get_c_string(object) except NULL
21+
object char_to_string(char*)
22+
void transfer_object_column(char *dst, char *src, size_t stride,
2323
size_t length)
2424
object sarr_from_data(cnp.dtype, int length, void* data)
25-
inline object unbox_if_zerodim(object arr)
25+
object unbox_if_zerodim(object arr)
2626

2727
ctypedef fused numeric:
2828
cnp.int8_t

0 commit comments

Comments
 (0)