Skip to content

Commit aab644b

Browse files
authored
Merge pull request numpy#27564 from mattip/gcc-13
BUILD: satisfy gcc-13 pendantic errors
2 parents 10a9e2e + 94d70fb commit aab644b

File tree

2 files changed

+2
-4
lines changed

2 files changed

+2
-4
lines changed

numpy/_core/src/multiarray/alloc.c

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -274,10 +274,8 @@ PyDataMem_RENEW(void *ptr, size_t size)
274274
void *result;
275275

276276
assert(size != 0);
277+
PyTraceMalloc_Untrack(NPY_TRACE_DOMAIN, (npy_uintp)ptr);
277278
result = realloc(ptr, size);
278-
if (result != ptr) {
279-
PyTraceMalloc_Untrack(NPY_TRACE_DOMAIN, (npy_uintp)ptr);
280-
}
281279
PyTraceMalloc_Track(NPY_TRACE_DOMAIN, (npy_uintp)result, size);
282280
return result;
283281
}

numpy/_core/src/umath/scalarmath.c.src

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1354,7 +1354,7 @@ static PyObject *
13541354
*/
13551355
PyObject *ret;
13561356
npy_float64 arg1, arg2, other_val;
1357-
@type@ other_val_conv;
1357+
@type@ other_val_conv = 0;
13581358

13591359
int is_forward;
13601360
if (Py_TYPE(a) == &Py@Name@ArrType_Type) {

0 commit comments

Comments
 (0)