Fixed compile errors after rebase.

This commit is contained in:
Josh Haberman 2015-10-06 14:53:47 -07:00
parent 00700b7219
commit 70ffefa551

View File

@ -313,7 +313,7 @@ static PyObject* New(PyTypeObject* type,
// Add the message to the DescriptorPool.
if (cdescriptor_pool::RegisterMessageClass(newtype->py_descriptor_pool,
descriptor, result) < 0) {
descriptor, result.get()) < 0) {
return NULL;
}
@ -1946,8 +1946,6 @@ static PyObject* RegisterExtension(PyObject* cls,
if (descriptor == NULL) {
return NULL;
}
const Descriptor* cmessage_descriptor = GetMessageDescriptor(
reinterpret_cast<PyTypeObject*>(cls));
ScopedPyObjectPtr extensions_by_name(
PyObject_GetAttr(cls, k_extensions_by_name));