aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJisi Liu <jisi.liu@gmail.com>2016-05-05 16:34:42 -0700
committerJisi Liu <jisi.liu@gmail.com>2016-05-05 16:34:42 -0700
commitf8a5c5f74650630a269951322a8afb915e7c9c3d (patch)
treefcc6ec01ec916ff8e0ef291c19034d2703356d1d
parent75e5898513d480c920486975389728dad3d158d6 (diff)
downloadprotobuf-f8a5c5f74650630a269951322a8afb915e7c9c3d.tar.gz
protobuf-f8a5c5f74650630a269951322a8afb915e7c9c3d.tar.bz2
protobuf-f8a5c5f74650630a269951322a8afb915e7c9c3d.zip
Fix using std::shared_ptr
-rw-r--r--python/google/protobuf/pyext/extension_dict.h2
-rw-r--r--python/google/protobuf/pyext/map_container.h2
-rw-r--r--python/google/protobuf/pyext/message.h2
-rw-r--r--python/google/protobuf/pyext/repeated_composite_container.h2
-rw-r--r--python/google/protobuf/pyext/repeated_scalar_container.h2
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 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 9a865147..3a4bec81 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 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