From 70ffefa5510321de6b02a3844a2d4cd19e107d1f Mon Sep 17 00:00:00 2001 From: Josh Haberman Date: Tue, 6 Oct 2015 14:53:47 -0700 Subject: Fixed compile errors after rebase. --- python/google/protobuf/pyext/message.cc | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'python/google') diff --git a/python/google/protobuf/pyext/message.cc b/python/google/protobuf/pyext/message.cc index db58df54..72f51ec1 100644 --- a/python/google/protobuf/pyext/message.cc +++ b/python/google/protobuf/pyext/message.cc @@ -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(cls)); ScopedPyObjectPtr extensions_by_name( PyObject_GetAttr(cls, k_extensions_by_name)); -- cgit v1.2.3