diff options
| author | Manjunath Kudlur <keveman@gmail.com> | 2015-12-09 07:40:30 -0800 |
|---|---|---|
| committer | Manjunath Kudlur <keveman@gmail.com> | 2015-12-09 07:40:30 -0800 |
| commit | 96537c461af6bb7d27e2a87560718c6a0bfd1032 (patch) | |
| tree | 99d89259b3dcb8f6d2660b4a17132980ded2f753 | |
| parent | d03ef20039111baf43a9b9754de3c56a63e6b13b (diff) | |
| download | protobuf-96537c461af6bb7d27e2a87560718c6a0bfd1032.tar.gz protobuf-96537c461af6bb7d27e2a87560718c6a0bfd1032.tar.bz2 protobuf-96537c461af6bb7d27e2a87560718c6a0bfd1032.zip | |
Bringing in internal::shared_ptr into google:protobuf namespace.
Fixes #1029
6 files changed, 12 insertions, 0 deletions
diff --git a/python/google/protobuf/pyext/extension_dict.h b/python/google/protobuf/pyext/extension_dict.h index 352495b9..7a66cb23 100644 --- a/python/google/protobuf/pyext/extension_dict.h +++ b/python/google/protobuf/pyext/extension_dict.h @@ -49,6 +49,8 @@ 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 5b495e89..94de4551 100644 --- a/python/google/protobuf/pyext/message.h +++ b/python/google/protobuf/pyext/message.h @@ -55,6 +55,8 @@ 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 d65ac4dd..4f6cb26a 100644 --- a/python/google/protobuf/pyext/message_map_container.h +++ b/python/google/protobuf/pyext/message_map_container.h @@ -47,6 +47,8 @@ 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 37f7b7e4..58d37b02 100644 --- a/python/google/protobuf/pyext/repeated_composite_container.h +++ b/python/google/protobuf/pyext/repeated_composite_container.h @@ -51,6 +51,8 @@ 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 bd73017d..555e621c 100644 --- a/python/google/protobuf/pyext/repeated_scalar_container.h +++ b/python/google/protobuf/pyext/repeated_scalar_container.h @@ -50,6 +50,8 @@ 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 c055d1b5..4d663b88 100644 --- a/python/google/protobuf/pyext/scalar_map_container.h +++ b/python/google/protobuf/pyext/scalar_map_container.h @@ -47,6 +47,8 @@ class Message; #ifdef _SHARED_PTR_H using std::shared_ptr; +#else +using internal::shared_ptr; #endif namespace python { |