aboutsummaryrefslogtreecommitdiffhomepage
path: root/python/google/protobuf/pyext/map_container.h
diff options
context:
space:
mode:
authorGravatar Jisi Liu <jisi.liu@gmail.com>2016-03-30 11:39:59 -0700
committerGravatar Jisi Liu <jisi.liu@gmail.com>2016-03-30 11:39:59 -0700
commit3b3c8abb9635eb3ea078a821a99c9ef29d66dff7 (patch)
tree7d2ec154f15c9f9153d890e76b6cf30e471ea488 /python/google/protobuf/pyext/map_container.h
parent78105897a8f01c7be9cf8502b6c58d47eb1ccdd7 (diff)
Integrate google internal changes.
Diffstat (limited to 'python/google/protobuf/pyext/map_container.h')
-rw-r--r--python/google/protobuf/pyext/map_container.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/python/google/protobuf/pyext/map_container.h b/python/google/protobuf/pyext/map_container.h
index ddf94be7..27ee6dbd 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 std::shared_ptr;
+using shared_ptr;
#else
using internal::shared_ptr;
#endif