summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVictor Stinner <vstinner@python.org>2020-09-26 10:48:41 (GMT)
committerGitHub <noreply@github.com>2020-09-26 10:48:41 (GMT)
commitd73cf7ca85fb60b739e671597aabe72cc36d397a (patch)
tree41036a0686438e0c2d878ab0095be8a78d4d5a59
parent9fdb76c34c44ac27531229b72aa2aa424d10e846 (diff)
downloadcpython-d73cf7ca85fb60b739e671597aabe72cc36d397a.zip
cpython-d73cf7ca85fb60b739e671597aabe72cc36d397a.tar.gz
cpython-d73cf7ca85fb60b739e671597aabe72cc36d397a.tar.bz2
bpo-41428: Fix compiler warning in unionobject.c (GH-22416)
Use Py_ssize_t type rather than int, to store lengths in unionobject.c. Fix the warning: Objects\unionobject.c(205,1): warning C4244: 'initializing': conversion from 'Py_ssize_t' to 'int', possible loss of data
-rw-r--r--Objects/unionobject.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/Objects/unionobject.c b/Objects/unionobject.c
index e055a55..8cfb2a6 100644
--- a/Objects/unionobject.c
+++ b/Objects/unionobject.c
@@ -202,8 +202,8 @@ flatten_args(PyObject* args)
PyTypeObject* arg_type = Py_TYPE(arg);
if (arg_type == &_Py_UnionType) {
PyObject* nested_args = ((unionobject*)arg)->args;
- int nested_arg_length = PyTuple_GET_SIZE(nested_args);
- for (int j = 0; j < nested_arg_length; j++) {
+ Py_ssize_t nested_arg_length = PyTuple_GET_SIZE(nested_args);
+ for (Py_ssize_t j = 0; j < nested_arg_length; j++) {
PyObject* nested_arg = PyTuple_GET_ITEM(nested_args, j);
Py_INCREF(nested_arg);
PyTuple_SET_ITEM(flattened_args, pos, nested_arg);
@@ -231,7 +231,7 @@ dedup_and_flatten_args(PyObject* args)
return NULL;
}
// Add unique elements to an array.
- int added_items = 0;
+ Py_ssize_t added_items = 0;
for (Py_ssize_t i = 0; i < arg_length; i++) {
int is_duplicate = 0;
PyObject* i_element = PyTuple_GET_ITEM(args, i);