diff options
| author | Jisi Liu <liujisi@google.com> | 2016-05-06 15:40:58 -0700 |
|---|---|---|
| committer | Jisi Liu <liujisi@google.com> | 2016-05-06 15:40:58 -0700 |
| commit | 9d0f56058a4baed89ea32c7217085db07ead44b0 (patch) | |
| tree | f45bcf0a2f817374832f3f0879b8e8053e7a7f7c | |
| parent | 76a96d46900173d64f7a0702b6ee568e3584681c (diff) | |
| parent | f8a5c5f74650630a269951322a8afb915e7c9c3d (diff) | |
| download | protobuf-9d0f56058a4baed89ea32c7217085db07ead44b0.tar.gz protobuf-9d0f56058a4baed89ea32c7217085db07ead44b0.tar.bz2 protobuf-9d0f56058a4baed89ea32c7217085db07ead44b0.zip | |
Merge pull request #1494 from pherl/master
Fix the std::string error introduced in integration.
5 files changed, 6 insertions, 6 deletions
diff --git a/python/google/protobuf/pyext/extension_dict.h b/python/google/protobuf/pyext/extension_dict.h index 049d2e45..2456eda1 100644 --- a/python/google/protobuf/pyext/extension_dict.h +++ b/python/google/protobuf/pyext/extension_dict.h @@ -48,7 +48,7 @@ class Message; class FieldDescriptor; #ifdef _SHARED_PTR_H -using shared_ptr; +using std::shared_ptr; #else using internal::shared_ptr; #endif diff --git a/python/google/protobuf/pyext/map_container.h b/python/google/protobuf/pyext/map_container.h index b11dfa34..fbd6713f 100644 --- a/python/google/protobuf/pyext/map_container.h +++ b/python/google/protobuf/pyext/map_container.h @@ -47,7 +47,7 @@ namespace protobuf { class Message; #ifdef _SHARED_PTR_H -using shared_ptr; +using std::shared_ptr; #else using internal::shared_ptr; #endif diff --git a/python/google/protobuf/pyext/message.h b/python/google/protobuf/pyext/message.h index 9dce198f..3a4bec81 100644 --- a/python/google/protobuf/pyext/message.h +++ b/python/google/protobuf/pyext/message.h @@ -53,8 +53,8 @@ class DescriptorPool; class MessageFactory; #ifdef _SHARED_PTR_H -using shared_ptr; -using std::std::string; +using std::shared_ptr; +using ::std::string; #else using internal::shared_ptr; #endif diff --git a/python/google/protobuf/pyext/repeated_composite_container.h b/python/google/protobuf/pyext/repeated_composite_container.h index 25463037..a7b56b61 100644 --- a/python/google/protobuf/pyext/repeated_composite_container.h +++ b/python/google/protobuf/pyext/repeated_composite_container.h @@ -50,7 +50,7 @@ class FieldDescriptor; class Message; #ifdef _SHARED_PTR_H -using shared_ptr; +using std::shared_ptr; #else using internal::shared_ptr; #endif diff --git a/python/google/protobuf/pyext/repeated_scalar_container.h b/python/google/protobuf/pyext/repeated_scalar_container.h index 608222e0..555e621c 100644 --- a/python/google/protobuf/pyext/repeated_scalar_container.h +++ b/python/google/protobuf/pyext/repeated_scalar_container.h @@ -49,7 +49,7 @@ namespace protobuf { class Message; #ifdef _SHARED_PTR_H -using shared_ptr; +using std::shared_ptr; #else using internal::shared_ptr; #endif |