From 75e5898513d480c920486975389728dad3d158d6 Mon Sep 17 00:00:00 2001 From: Jisi Liu Date: Thu, 5 May 2016 16:04:30 -0700 Subject: [PATCH 1/2] Fix the std::string error introduced in integration. --- python/google/protobuf/pyext/message.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/python/google/protobuf/pyext/message.h b/python/google/protobuf/pyext/message.h index 9dce198fc..9a8651474 100644 --- a/python/google/protobuf/pyext/message.h +++ b/python/google/protobuf/pyext/message.h @@ -54,7 +54,7 @@ class MessageFactory; #ifdef _SHARED_PTR_H using shared_ptr; -using std::std::string; +using ::std::string; #else using internal::shared_ptr; #endif From f8a5c5f74650630a269951322a8afb915e7c9c3d Mon Sep 17 00:00:00 2001 From: Jisi Liu Date: Thu, 5 May 2016 16:34:42 -0700 Subject: [PATCH 2/2] Fix using std::shared_ptr --- python/google/protobuf/pyext/extension_dict.h | 2 +- python/google/protobuf/pyext/map_container.h | 2 +- python/google/protobuf/pyext/message.h | 2 +- python/google/protobuf/pyext/repeated_composite_container.h | 2 +- python/google/protobuf/pyext/repeated_scalar_container.h | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/python/google/protobuf/pyext/extension_dict.h b/python/google/protobuf/pyext/extension_dict.h index 049d2e457..2456eda1e 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 b11dfa34e..fbd6713f7 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 9a8651474..3a4bec81c 100644 --- a/python/google/protobuf/pyext/message.h +++ b/python/google/protobuf/pyext/message.h @@ -53,7 +53,7 @@ class DescriptorPool; class MessageFactory; #ifdef _SHARED_PTR_H -using shared_ptr; +using std::shared_ptr; using ::std::string; #else using internal::shared_ptr; diff --git a/python/google/protobuf/pyext/repeated_composite_container.h b/python/google/protobuf/pyext/repeated_composite_container.h index 25463037b..a7b56b61b 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 608222e03..555e621c9 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