From: Alexander Belopolsky Date: Fri, 22 Jun 2012 18:11:58 +0000 (-0400) Subject: Fixed compiler warnings in datetime_astimezone() X-Git-Tag: v3.3.0b1~154^2~6^2~2 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=878054e97b517538eb9c9be0e01abde019e085ea;p=python Fixed compiler warnings in datetime_astimezone() --- diff --git a/Modules/_datetimemodule.c b/Modules/_datetimemodule.c index db6156c150..149f573c69 100644 --- a/Modules/_datetimemodule.c +++ b/Modules/_datetimemodule.c @@ -4754,7 +4754,7 @@ local_timezone(PyDateTime_DateTime *utc_time) return result; } -static PyObject * +static PyDateTime_DateTime * datetime_astimezone(PyDateTime_DateTime *self, PyObject *args, PyObject *kw) { PyDateTime_DateTime *result; @@ -4777,7 +4777,7 @@ datetime_astimezone(PyDateTime_DateTime *self, PyObject *args, PyObject *kw) /* Conversion to self's own time zone is a NOP. */ if (self->tzinfo == tzinfo) { Py_INCREF(self); - return (PyObject *)self; + return self; } /* Convert self to UTC. */ @@ -4814,10 +4814,11 @@ datetime_astimezone(PyDateTime_DateTime *self, PyObject *args, PyObject *kw) Py_DECREF(temp); temp = (PyObject *)result; - result = _PyObject_CallMethodId(tzinfo, &PyId_fromutc, "O", temp); + result = (PyDateTime_DateTime *) + _PyObject_CallMethodId(tzinfo, &PyId_fromutc, "O", temp); Py_DECREF(temp); - return (PyObject *)result; + return result; } static PyObject *