aboutsummaryrefslogtreecommitdiff
path: root/python
diff options
context:
space:
mode:
authorManjunath Kudlur <keveman@gmail.com>2015-12-07 13:08:21 -0800
committerManjunath Kudlur <keveman@gmail.com>2015-12-07 13:08:21 -0800
commit3ff1dca0bd9c1526cc0377533db89c4a45862253 (patch)
tree031bcc9871bc786d4f31e4d237a0035d789eeea7 /python
parent9bd74b7f25b45b253f46025d7300a17df58d213f (diff)
downloadprotobuf-3ff1dca0bd9c1526cc0377533db89c4a45862253.tar.gz
Enable fast cpp protos in the python interface.
Diffstat (limited to 'python')
-rw-r--r--python/google/protobuf/pyext/extension_dict.h3
-rw-r--r--python/google/protobuf/pyext/message.h3
-rw-r--r--python/google/protobuf/pyext/message_map_container.h3
-rw-r--r--python/google/protobuf/pyext/repeated_composite_container.h3
-rw-r--r--python/google/protobuf/pyext/repeated_scalar_container.h3
-rw-r--r--python/google/protobuf/pyext/scalar_map_container.h3
6 files changed, 12 insertions, 6 deletions
diff --git a/python/google/protobuf/pyext/extension_dict.h b/python/google/protobuf/pyext/extension_dict.h
index 7e1049f19..0cac8ba63 100644
--- a/python/google/protobuf/pyext/extension_dict.h
+++ b/python/google/protobuf/pyext/extension_dict.h
@@ -47,7 +47,8 @@ namespace protobuf {
class Message;
class FieldDescriptor;
-using internal::shared_ptr;
+using std::shared_ptr;
+using std::string;
namespace python {
diff --git a/python/google/protobuf/pyext/message.h b/python/google/protobuf/pyext/message.h
index 1ff82e2f6..d4b7f4cfe 100644
--- a/python/google/protobuf/pyext/message.h
+++ b/python/google/protobuf/pyext/message.h
@@ -52,7 +52,8 @@ class Descriptor;
class DescriptorPool;
class MessageFactory;
-using internal::shared_ptr;
+using std::shared_ptr;
+using std::string;
namespace python {
diff --git a/python/google/protobuf/pyext/message_map_container.h b/python/google/protobuf/pyext/message_map_container.h
index 8286ba8ac..270922d4c 100644
--- a/python/google/protobuf/pyext/message_map_container.h
+++ b/python/google/protobuf/pyext/message_map_container.h
@@ -45,7 +45,8 @@ namespace protobuf {
class Message;
-using internal::shared_ptr;
+using std::shared_ptr;
+using std::string;
namespace python {
diff --git a/python/google/protobuf/pyext/repeated_composite_container.h b/python/google/protobuf/pyext/repeated_composite_container.h
index 3013aba9a..494db0ecd 100644
--- a/python/google/protobuf/pyext/repeated_composite_container.h
+++ b/python/google/protobuf/pyext/repeated_composite_container.h
@@ -49,7 +49,8 @@ namespace protobuf {
class FieldDescriptor;
class Message;
-using internal::shared_ptr;
+using std::shared_ptr;
+using std::string;
namespace python {
diff --git a/python/google/protobuf/pyext/repeated_scalar_container.h b/python/google/protobuf/pyext/repeated_scalar_container.h
index 5dfa21e08..a13cf9b2c 100644
--- a/python/google/protobuf/pyext/repeated_scalar_container.h
+++ b/python/google/protobuf/pyext/repeated_scalar_container.h
@@ -48,7 +48,8 @@ namespace protobuf {
class Message;
-using internal::shared_ptr;
+using std::shared_ptr;
+using std::string;
namespace python {
diff --git a/python/google/protobuf/pyext/scalar_map_container.h b/python/google/protobuf/pyext/scalar_map_container.h
index aded8d490..8807892d8 100644
--- a/python/google/protobuf/pyext/scalar_map_container.h
+++ b/python/google/protobuf/pyext/scalar_map_container.h
@@ -45,7 +45,8 @@ namespace protobuf {
class Message;
-using internal::shared_ptr;
+using std::shared_ptr;
+using std::string;
namespace python {