summaryrefslogtreecommitdiffstats
path: root/Objects/bytearrayobject.c
diff options
context:
space:
mode:
authorMartin v. Löwis <martin@v.loewis.de>2014-07-27 15:29:17 (GMT)
committerMartin v. Löwis <martin@v.loewis.de>2014-07-27 15:29:17 (GMT)
commit0efea322a9733c5184eaacea4e3a6484609de587 (patch)
treeab5009aff713a713cd16c557b28840c653f9d431 /Objects/bytearrayobject.c
parent7252a6e81e1e1616057fa806836ec85ec88e1c1c (diff)
downloadcpython-0efea322a9733c5184eaacea4e3a6484609de587.zip
cpython-0efea322a9733c5184eaacea4e3a6484609de587.tar.gz
cpython-0efea322a9733c5184eaacea4e3a6484609de587.tar.bz2
Rerun AC, silence pointer conversion warnings.
Diffstat (limited to 'Objects/bytearrayobject.c')
-rw-r--r--Objects/bytearrayobject.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/Objects/bytearrayobject.c b/Objects/bytearrayobject.c
index 1107b07..242b3b2 100644
--- a/Objects/bytearrayobject.c
+++ b/Objects/bytearrayobject.c
@@ -3263,7 +3263,7 @@ bytearray_decode_impl(PyByteArrayObject *self, const char *encoding, const char
{
if (encoding == NULL)
encoding = PyUnicode_GetDefaultEncoding();
- return PyUnicode_FromEncodedObject(self, encoding, errors);
+ return PyUnicode_FromEncodedObject((PyObject*)self, encoding, errors);
}
PyDoc_STRVAR(alloc_doc,
@@ -3307,7 +3307,7 @@ static PyObject *
bytearray_join(PyByteArrayObject *self, PyObject *iterable_of_bytes)
/*[clinic end generated code: output=544e7430032dfdf4 input=aba6b1f9b30fcb8e]*/
{
- return stringlib_bytes_join(self, iterable_of_bytes);
+ return stringlib_bytes_join((PyObject*)self, iterable_of_bytes);
}
/*[clinic input]