summaryrefslogtreecommitdiff
path: root/Objects/bytes_methods.c
diff options
context:
space:
mode:
authorAntoine Pitrou <solipsis@pitrou.net>2010-08-15 17:46:50 +0000
committerAntoine Pitrou <solipsis@pitrou.net>2010-08-15 17:46:50 +0000
commitbc760d9f4572c1f2356f7444d8cd3aa01f7fad38 (patch)
treef0b7b49d3b9caf8670b24ae43765004f033e9b08 /Objects/bytes_methods.c
parent00d5f35b85f4ef9a1cdfff1c2f4d77792e06320c (diff)
downloadcpython-git-bc760d9f4572c1f2356f7444d8cd3aa01f7fad38.tar.gz
Merged revisions 84070,84074 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k ........ r84070 | antoine.pitrou | 2010-08-15 19:12:55 +0200 (dim., 15 août 2010) | 5 lines Fix some compilation warnings under 64-bit Windows (issue #9566). Some of these are genuine bugs with objects bigger than 2GB, but my system doesn't allow me to write tests for it. ........ r84074 | antoine.pitrou | 2010-08-15 19:41:31 +0200 (dim., 15 août 2010) | 3 lines Fix (harmless) warning with MSVC. ........
Diffstat (limited to 'Objects/bytes_methods.c')
-rw-r--r--Objects/bytes_methods.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/Objects/bytes_methods.c b/Objects/bytes_methods.c
index 099cee60a5..ef91b7f337 100644
--- a/Objects/bytes_methods.c
+++ b/Objects/bytes_methods.c
@@ -417,7 +417,7 @@ _Py_bytes_maketrans(PyObject *args)
}
p = PyBytes_AS_STRING(res);
for (i = 0; i < 256; i++)
- p[i] = i;
+ p[i] = (char) i;
for (i = 0; i < bfrm.len; i++) {
p[((unsigned char *)bfrm.buf)[i]] = ((char *)bto.buf)[i];
}