Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit 4dcfcc5

Browse files
juliantaylorjuliantaylor
committed
MAINT: fix a bunch of compiler warnings
1 parent dd85748 commit 4dcfcc5

14 files changed

Lines changed: 39 additions & 27 deletions

‎numpy/core/src/multiarray/arrayobject.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1684,7 +1684,7 @@ array_alloc(PyTypeObject *type, Py_ssize_t NPY_UNUSED(nitems))
16841684
return obj;
16851685
}
16861686

1687-
static PyObject *
1687+
static void
16881688
array_free(PyObject * v)
16891689
{
16901690
/* avoid same deallocator as PyBaseObject, see gentype_free */

‎numpy/core/src/multiarray/descriptor.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1578,7 +1578,7 @@ PyArray_DescrNew(PyArray_Descr *base)
15781578
newdescr->subarray = PyArray_malloc(sizeof(PyArray_ArrayDescr));
15791579
if (newdescr->subarray == NULL) {
15801580
Py_DECREF(newdescr);
1581-
return PyErr_NoMemory();
1581+
return (PyArray_Descr *)PyErr_NoMemory();
15821582
}
15831583
memcpy(newdescr->subarray, base->subarray, sizeof(PyArray_ArrayDescr));
15841584
Py_INCREF(newdescr->subarray->shape);
@@ -2729,7 +2729,7 @@ PyArray_DescrNewByteorder(PyArray_Descr *self, char newendian)
27292729
if (endian != NPY_IGNORE) {
27302730
if (newendian == NPY_SWAP) {
27312731
/* swap byteorder */
2732-
if PyArray_ISNBO(endian) {
2732+
if (PyArray_ISNBO(endian)) {
27332733
endian = NPY_OPPBYTE;
27342734
}
27352735
else {

‎numpy/core/src/multiarray/dtype_transfer.c‎

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3060,14 +3060,16 @@ static void _strided_masked_wrapper_decsrcref_transfer_function(
30603060

30613061
while (N > 0) {
30623062
/* Skip masked values, still calling decsrcref for move_references */
3063-
mask = npy_memchr((char *)mask, 0, mask_stride, N, &subloopsize, 1);
3063+
mask = (npy_bool*)npy_memchr((char *)mask, 0, mask_stride, N,
3064+
&subloopsize, 1);
30643065
decsrcref_stransfer(NULL, 0, src, src_stride,
30653066
subloopsize, src_itemsize, decsrcref_transferdata);
30663067
dst += subloopsize * dst_stride;
30673068
src += subloopsize * src_stride;
30683069
N -= subloopsize;
30693070
/* Process unmasked values */
3070-
mask = npy_memchr((char *)mask, 0, mask_stride, N, &subloopsize, 0);
3071+
mask = (npy_bool*)npy_memchr((char *)mask, 0, mask_stride, N,
3072+
&subloopsize, 0);
30713073
unmasked_stransfer(dst, dst_stride, src, src_stride,
30723074
subloopsize, src_itemsize, unmasked_transferdata);
30733075
dst += subloopsize * dst_stride;
@@ -3095,12 +3097,14 @@ static void _strided_masked_wrapper_transfer_function(
30953097

30963098
while (N > 0) {
30973099
/* Skip masked values */
3098-
mask = npy_memchr((char *)mask, 0, mask_stride, N, &subloopsize, 1);
3100+
mask = (npy_bool*)npy_memchr((char *)mask, 0, mask_stride, N,
3101+
&subloopsize, 1);
30993102
dst += subloopsize * dst_stride;
31003103
src += subloopsize * src_stride;
31013104
N -= subloopsize;
31023105
/* Process unmasked values */
3103-
mask = npy_memchr((char *)mask, 0, mask_stride, N, &subloopsize, 0);
3106+
mask = (npy_bool*)npy_memchr((char *)mask, 0, mask_stride, N,
3107+
&subloopsize, 0);
31043108
unmasked_stransfer(dst, dst_stride, src, src_stride,
31053109
subloopsize, src_itemsize, unmasked_transferdata);
31063110
dst += subloopsize * dst_stride;

‎numpy/core/src/multiarray/item_selection.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1258,7 +1258,7 @@ PyArray_Partition(PyArrayObject *op, PyArrayObject * ktharray, int axis, NPY_SEL
12581258
PyArray_PartitionFunc * part = get_partition_func(PyArray_TYPE(op), which);
12591259

12601260
n = PyArray_NDIM(op);
1261-
if ((n == 0)) {
1261+
if (n == 0) {
12621262
return 0;
12631263
}
12641264
if (axis < 0) {

‎numpy/core/src/multiarray/mapping.c‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -623,7 +623,7 @@ prepare_index(PyArrayObject *self, PyObject *index,
623623
}
624624

625625
/* Normal case of an integer array */
626-
else if PyArray_ISINTEGER(arr) {
626+
else if (PyArray_ISINTEGER(arr)) {
627627
if (PyArray_NDIM(arr) == 0) {
628628
/*
629629
* A 0-d integer array is an array scalar and can
@@ -1046,7 +1046,7 @@ array_boolean_subscript(PyArrayObject *self,
10461046
return NULL;
10471047
}
10481048

1049-
if (PyArray_SetBaseObject(ret, tmp) < 0) {
1049+
if (PyArray_SetBaseObject(ret, (PyObject *)tmp) < 0) {
10501050
Py_DECREF(ret);
10511051
return NULL;
10521052
}
@@ -1468,7 +1468,7 @@ array_subscript(PyArrayObject *self, PyObject *op)
14681468
*/
14691469
if (index_type == HAS_FANCY && index_num == 1) {
14701470
/* The array being indexed has one dimension and it is a fancy index */
1471-
PyArrayObject *ind = indices[0].object;
1471+
PyArrayObject *ind = (PyArrayObject*)indices[0].object;
14721472

14731473
/* Check if the index is simple enough */
14741474
if (PyArray_TRIVIALLY_ITERABLE(ind) &&
@@ -1838,7 +1838,7 @@ array_assign_subscript(PyArrayObject *self, PyObject *ind, PyObject *op)
18381838
if (index_type == HAS_FANCY &&
18391839
index_num == 1 && tmp_arr) {
18401840
/* The array being indexed has one dimension and it is a fancy index */
1841-
PyArrayObject *ind = indices[0].object;
1841+
PyArrayObject *ind = (PyArrayObject*)indices[0].object;
18421842

18431843
/* Check if the type is equivalent */
18441844
if (PyArray_EquivTypes(PyArray_DESCR(self),
@@ -2593,7 +2593,8 @@ PyArray_MapIterNew(npy_index_info *indices , int index_num, int index_type,
25932593
permute.len = mit->nd;
25942594
permute.ptr = &PyArray_DIMS(extra_op)[
25952595
PyArray_NDIM(extra_op) - mit->nd];
2596-
tmp_arr = PyArray_Newshape(extra_op, &permute, NPY_CORDER);
2596+
tmp_arr = (PyArrayObject*)PyArray_Newshape(extra_op, &permute,
2597+
NPY_CORDER);
25972598
if (tmp_arr == NULL) {
25982599
goto broadcast_error;
25992600
}

‎numpy/core/src/multiarray/multiarraymodule.c‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2092,15 +2092,16 @@ static PyObject *
20922092
array_matrixproduct(PyObject *NPY_UNUSED(dummy), PyObject *args, PyObject* kwds)
20932093
{
20942094
int errval;
2095-
static PyObject *cached_npy_dot = NULL;
2095+
static PyUFuncObject *cached_npy_dot = NULL;
20962096
PyObject *override = NULL;
20972097
PyObject *v, *a, *o = NULL;
20982098
char* kwlist[] = {"a", "b", "out", NULL };
20992099
PyObject *module;
21002100

21012101
if (cached_npy_dot == NULL) {
21022102
module = PyImport_ImportModule("numpy.core.multiarray");
2103-
cached_npy_dot = PyDict_GetItemString(PyModule_GetDict(module), "dot");
2103+
cached_npy_dot = (PyUFuncObject*)PyDict_GetItemString(
2104+
PyModule_GetDict(module), "dot");
21042105

21052106
Py_INCREF(cached_npy_dot);
21062107
Py_DECREF(module);

‎numpy/core/src/multiarray/number.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -408,7 +408,7 @@ is_scalar_with_conversion(PyObject *o2, double* out_exponent)
408408
return NPY_FLOAT_SCALAR;
409409
}
410410
}
411-
else if PyArray_IsScalar(o2, Integer) {
411+
else if (PyArray_IsScalar(o2, Integer)) {
412412
return NPY_INTPOS_SCALAR;
413413
}
414414
else { /* IsScalar(o2, Floating) */

‎numpy/core/src/multiarray/refcount.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ PyArray_Item_XDECREF(char *data, PyArray_Descr *descr)
7070
NPY_COPY_PYOBJECT_PTR(&temp, data);
7171
Py_XDECREF(temp);
7272
}
73-
else if PyDataType_HASFIELDS(descr) {
73+
else if (PyDataType_HASFIELDS(descr)) {
7474
PyObject *key, *value, *title = NULL;
7575
PyArray_Descr *new;
7676
int offset;

‎numpy/core/src/multiarray/scalarapi.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -634,7 +634,7 @@ PyArray_Scalar(void *data, PyArray_Descr *descr, PyObject *base)
634634
copyswap = descr->f->copyswap;
635635
type = descr->typeobj;
636636
swap = !PyArray_ISNBO(descr->byteorder);
637-
if PyTypeNum_ISSTRING(type_num) {
637+
if (PyTypeNum_ISSTRING(type_num)) {
638638
/* Eliminate NULL bytes */
639639
char *dptr = data;
640640

‎numpy/core/src/multiarray/scalartypes.c.src‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2951,7 +2951,7 @@ long_arrtype_hash(PyObject *obj)
29512951
* #Char = ,U#
29522952
* #Word = ,Unsigned#
29532953
*/
2954-
static npy_hash_t
2954+
static NPY_INLINE npy_hash_t
29552955
@char@longlong_arrtype_hash(PyObject *obj)
29562956
{
29572957
PyObject * l = PyLong_From@Word@LongLong(
@@ -3363,7 +3363,6 @@ gen_arrtype_subscript(PyObject *self, PyObject *key)
33633363
* the data where N is the number of None's in <???>.
33643364
*/
33653365
PyObject *res, *ret;
3366-
int N;
33673366

33683367
res = PyArray_FromScalar(self, NULL);
33693368

@@ -3989,7 +3988,7 @@ initialize_numeric_types(void)
39893988
PyGenericArrType_Type.tp_getset = gentype_getsets;
39903989
PyGenericArrType_Type.tp_new = NULL;
39913990
PyGenericArrType_Type.tp_alloc = gentype_alloc;
3992-
PyGenericArrType_Type.tp_free = gentype_free;
3991+
PyGenericArrType_Type.tp_free = (freefunc)gentype_free;
39933992
PyGenericArrType_Type.tp_repr = gentype_repr;
39943993
PyGenericArrType_Type.tp_str = gentype_str;
39953994
PyGenericArrType_Type.tp_richcompare = gentype_richcompare;

0 commit comments

Comments
 (0)