From 3f9b4f2944074b3ccdcdeb3ae508ec170055571e Mon Sep 17 00:00:00 2001
From: Manjunath Kudlur <keveman@gmail.com>
Date: Mon, 7 Dec 2015 14:15:29 -0800
Subject: [PATCH] Updated for c++98 compatibility

---
 python/google/protobuf/pyext/extension_dict.h               | 3 ++-
 python/google/protobuf/pyext/message.h                      | 2 ++
 python/google/protobuf/pyext/message_map_container.h        | 3 ++-
 python/google/protobuf/pyext/repeated_composite_container.h | 3 ++-
 python/google/protobuf/pyext/repeated_scalar_container.h    | 3 ++-
 python/google/protobuf/pyext/scalar_map_container.h         | 3 ++-
 6 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/python/google/protobuf/pyext/extension_dict.h b/python/google/protobuf/pyext/extension_dict.h
index 0cac8ba639..352495b9a4 100644
--- a/python/google/protobuf/pyext/extension_dict.h
+++ b/python/google/protobuf/pyext/extension_dict.h
@@ -47,8 +47,9 @@ namespace protobuf {
 class Message;
 class FieldDescriptor;
 
+#ifdef _SHARED_PTR_H
 using std::shared_ptr;
-using std::string;
+#endif
 
 namespace python {
 
diff --git a/python/google/protobuf/pyext/message.h b/python/google/protobuf/pyext/message.h
index d4b7f4cfea..5b495e8922 100644
--- a/python/google/protobuf/pyext/message.h
+++ b/python/google/protobuf/pyext/message.h
@@ -52,8 +52,10 @@ class Descriptor;
 class DescriptorPool;
 class MessageFactory;
 
+#ifdef _SHARED_PTR_H
 using std::shared_ptr;
 using std::string;
+#endif
 
 namespace python {
 
diff --git a/python/google/protobuf/pyext/message_map_container.h b/python/google/protobuf/pyext/message_map_container.h
index 270922d4cc..d65ac4ddd6 100644
--- a/python/google/protobuf/pyext/message_map_container.h
+++ b/python/google/protobuf/pyext/message_map_container.h
@@ -45,8 +45,9 @@ namespace protobuf {
 
 class Message;
 
+#ifdef _SHARED_PTR_H
 using std::shared_ptr;
-using std::string;
+#endif
 
 namespace python {
 
diff --git a/python/google/protobuf/pyext/repeated_composite_container.h b/python/google/protobuf/pyext/repeated_composite_container.h
index 494db0ecda..37f7b7e49d 100644
--- a/python/google/protobuf/pyext/repeated_composite_container.h
+++ b/python/google/protobuf/pyext/repeated_composite_container.h
@@ -49,8 +49,9 @@ namespace protobuf {
 class FieldDescriptor;
 class Message;
 
+#ifdef _SHARED_PTR_H
 using std::shared_ptr;
-using std::string;
+#endif
 
 namespace python {
 
diff --git a/python/google/protobuf/pyext/repeated_scalar_container.h b/python/google/protobuf/pyext/repeated_scalar_container.h
index a13cf9b2cd..bd73017dd9 100644
--- a/python/google/protobuf/pyext/repeated_scalar_container.h
+++ b/python/google/protobuf/pyext/repeated_scalar_container.h
@@ -48,8 +48,9 @@ namespace protobuf {
 
 class Message;
 
+#ifdef _SHARED_PTR_H
 using std::shared_ptr;
-using std::string;
+#endif
 
 namespace python {
 
diff --git a/python/google/protobuf/pyext/scalar_map_container.h b/python/google/protobuf/pyext/scalar_map_container.h
index 8807892d87..c055d1b561 100644
--- a/python/google/protobuf/pyext/scalar_map_container.h
+++ b/python/google/protobuf/pyext/scalar_map_container.h
@@ -45,8 +45,9 @@ namespace protobuf {
 
 class Message;
 
+#ifdef _SHARED_PTR_H
 using std::shared_ptr;
-using std::string;
+#endif
 
 namespace python {