diff options
| author |  Feng Xiao <xfxyjwf@gmail.com> | 2015-08-22 18:25:48 -0700 |
|---|---|---|
| committer | Feng Xiao <xfxyjwf@gmail.com> | 2015-08-22 18:25:48 -0700 |
| commit | eee38b0c018b3279f77d03dff796f440f40d3516 (patch) | |
| tree | 7ff0978e30238d493fc7899b75abeb6d66939f07 /python/google/protobuf/pyext/descriptor.cc | |
| parent | c3bc155aceda36ecb01cde2367a3b427f2d7ce40 (diff) | |
Down-integrate from google3.
Diffstat (limited to 'python/google/protobuf/pyext/descriptor.cc')
| -rw-r--r-- | python/google/protobuf/pyext/descriptor.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/python/google/protobuf/pyext/descriptor.cc b/python/google/protobuf/pyext/descriptor.cc index 2160757b..8581f529 100644 --- a/python/google/protobuf/pyext/descriptor.cc +++ b/python/google/protobuf/pyext/descriptor.cc @@ -193,7 +193,7 @@ static PyObject* GetOrBuildOptions(const DescriptorClass *descriptor) { io::CodedInputStream input( reinterpret_cast<const uint8*>(serialized.c_str()), serialized.size()); input.SetExtensionRegistry(GetDescriptorPool()->pool, - cmessage::GetMessageFactory()); + GetDescriptorPool()->message_factory); bool success = cmsg->message->MergePartialFromCodedStream(&input); if (!success) { PyErr_Format(PyExc_ValueError, "Error parsing Options message"); |