Merge pull request #1494 from pherl/master

Fix the std::string error introduced in integration.

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

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

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

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

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