Rerun AC, silence pointer conversion warnings.

wallix · Jul 27, 2014 · 0efea32 · 0efea32
1 parent 7252a6e
commit 0efea32
Show file tree

Hide file tree

Showing 2 changed files with 102 additions and 73 deletions.
diff --git 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]