aboutsummaryrefslogtreecommitdiffhomepage
path: root/python/google/protobuf/pyext/extension_dict.h
diff options
context:
space:
mode:
authorGravatar Manjunath Kudlur <keveman@gmail.com>2015-12-09 07:40:30 -0800
committerGravatar Manjunath Kudlur <keveman@gmail.com>2015-12-09 07:40:30 -0800
commit96537c461af6bb7d27e2a87560718c6a0bfd1032 (patch)
tree99d89259b3dcb8f6d2660b4a17132980ded2f753 /python/google/protobuf/pyext/extension_dict.h
parentd03ef20039111baf43a9b9754de3c56a63e6b13b (diff)
Bringing in internal::shared_ptr into google:protobuf namespace.
Fixes #1029
Diffstat (limited to 'python/google/protobuf/pyext/extension_dict.h')
-rw-r--r--python/google/protobuf/pyext/extension_dict.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/python/google/protobuf/pyext/extension_dict.h b/python/google/protobuf/pyext/extension_dict.h
index 352495b9..7a66cb23 100644
--- a/python/google/protobuf/pyext/extension_dict.h
+++ b/python/google/protobuf/pyext/extension_dict.h
@@ -49,6 +49,8 @@ class FieldDescriptor;
#ifdef _SHARED_PTR_H
using std::shared_ptr;
+#else
+using internal::shared_ptr;
#endif
namespace python {