diff options
| author | Josh Haberman <jhaberman@gmail.com> | 2018-09-04 10:58:54 -0700 |
|---|---|---|
| committer | Josh Haberman <jhaberman@gmail.com> | 2018-09-04 10:58:54 -0700 |
| commit | d61aede89cf188367766b971f59cf57d7835d8e8 (patch) | |
| tree | a19842c62c3c8f51389912ecafdf932d0a572bea /python/google/protobuf/pyext/descriptor_pool.h | |
| parent | 45d03a977193d1dcce5251e4bffe17bf0ba738ec (diff) | |
| download | protobuf-d61aede89cf188367766b971f59cf57d7835d8e8.tar.gz protobuf-d61aede89cf188367766b971f59cf57d7835d8e8.tar.bz2 protobuf-d61aede89cf188367766b971f59cf57d7835d8e8.zip | |
Down-integrate from google3.
Diffstat (limited to 'python/google/protobuf/pyext/descriptor_pool.h')
| -rw-r--r-- | python/google/protobuf/pyext/descriptor_pool.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/python/google/protobuf/pyext/descriptor_pool.h b/python/google/protobuf/pyext/descriptor_pool.h index 8289daea..8e7b4d6b 100644 --- a/python/google/protobuf/pyext/descriptor_pool.h +++ b/python/google/protobuf/pyext/descriptor_pool.h @@ -89,7 +89,7 @@ namespace cdescriptor_pool { // Looks up a message by name. // Returns a message Descriptor, or NULL if not found. const Descriptor* FindMessageTypeByName(PyDescriptorPool* self, - const string& name); + const std::string& name); // The functions below are also exposed as methods of the DescriptorPool type. |