diff options
| author | Joshua Haberman <jhaberman@gmail.com> | 2015-12-10 09:41:51 -0800 |
|---|---|---|
| committer | Joshua Haberman <jhaberman@gmail.com> | 2015-12-10 09:41:51 -0800 |
| commit | 014b9012d32c6409bf2f4f13ff4608a2cbc7cb9a (patch) | |
| tree | 846db441878b248824bb1d46fe10c880e7b4d06a /python/google | |
| parent | 9cbf40873d7093c832b038b2070426a9d7383e9c (diff) | |
| parent | 96537c461af6bb7d27e2a87560718c6a0bfd1032 (diff) | |
| download | protobuf-014b9012d32c6409bf2f4f13ff4608a2cbc7cb9a.tar.gz protobuf-014b9012d32c6409bf2f4f13ff4608a2cbc7cb9a.tar.bz2 protobuf-014b9012d32c6409bf2f4f13ff4608a2cbc7cb9a.zip | |
Merge pull request #1029 from keveman/master
Enable fast cpp protos in the python interface.
Diffstat (limited to 'python/google')
6 files changed, 25 insertions, 0 deletions
diff --git a/python/google/protobuf/pyext/extension_dict.h b/python/google/protobuf/pyext/extension_dict.h index 7e1049f1..7a66cb23 100644 --- a/python/google/protobuf/pyext/extension_dict.h +++ b/python/google/protobuf/pyext/extension_dict.h @@ -47,7 +47,11 @@ namespace protobuf { class Message; class FieldDescriptor; +#ifdef _SHARED_PTR_H +using std::shared_ptr; +#else using internal::shared_ptr; +#endif namespace python { diff --git a/python/google/protobuf/pyext/message.h b/python/google/protobuf/pyext/message.h index 1ff82e2f..94de4551 100644 --- a/python/google/protobuf/pyext/message.h +++ b/python/google/protobuf/pyext/message.h @@ -52,7 +52,12 @@ class Descriptor; class DescriptorPool; class MessageFactory; +#ifdef _SHARED_PTR_H +using std::shared_ptr; +using std::string; +#else using internal::shared_ptr; +#endif namespace python { diff --git a/python/google/protobuf/pyext/message_map_container.h b/python/google/protobuf/pyext/message_map_container.h index 8286ba8a..4f6cb26a 100644 --- a/python/google/protobuf/pyext/message_map_container.h +++ b/python/google/protobuf/pyext/message_map_container.h @@ -45,7 +45,11 @@ namespace protobuf { class Message; +#ifdef _SHARED_PTR_H +using std::shared_ptr; +#else using internal::shared_ptr; +#endif namespace python { diff --git a/python/google/protobuf/pyext/repeated_composite_container.h b/python/google/protobuf/pyext/repeated_composite_container.h index 3013aba9..58d37b02 100644 --- a/python/google/protobuf/pyext/repeated_composite_container.h +++ b/python/google/protobuf/pyext/repeated_composite_container.h @@ -49,7 +49,11 @@ namespace protobuf { class FieldDescriptor; class Message; +#ifdef _SHARED_PTR_H +using std::shared_ptr; +#else using internal::shared_ptr; +#endif namespace python { diff --git a/python/google/protobuf/pyext/repeated_scalar_container.h b/python/google/protobuf/pyext/repeated_scalar_container.h index 5dfa21e0..555e621c 100644 --- a/python/google/protobuf/pyext/repeated_scalar_container.h +++ b/python/google/protobuf/pyext/repeated_scalar_container.h @@ -48,7 +48,11 @@ namespace protobuf { class Message; +#ifdef _SHARED_PTR_H +using std::shared_ptr; +#else using internal::shared_ptr; +#endif namespace python { diff --git a/python/google/protobuf/pyext/scalar_map_container.h b/python/google/protobuf/pyext/scalar_map_container.h index aded8d49..4d663b88 100644 --- a/python/google/protobuf/pyext/scalar_map_container.h +++ b/python/google/protobuf/pyext/scalar_map_container.h @@ -45,7 +45,11 @@ namespace protobuf { class Message; +#ifdef _SHARED_PTR_H +using std::shared_ptr; +#else using internal::shared_ptr; +#endif namespace python { |