Integrated internal changes from Google

1 files changed, 5 insertions, 4 deletions

diff --git a/src/google/protobuf/descriptor.h b/src/google/protobuf/descriptor.h
index 5f5159a8..115d4ddc 100644
--- a/src/google/protobuf/descriptor.h
+++ b/src/google/protobuf/descriptor.h
@@ -55,9 +55,6 @@
 #define GOOGLE_PROTOBUF_DESCRIPTOR_H__
 
 #include <memory>
-#ifndef _SHARED_PTR_H
-#include <google/protobuf/stubs/shared_ptr.h>
-#endif
 #include <set>
 #include <string>
 #include <vector>
@@ -87,6 +84,7 @@ class DescriptorPool;
 
 // Defined in descriptor.proto
 class DescriptorProto;
+class DescriptorProto_ExtensionRange;
 class FieldDescriptorProto;
 class OneofDescriptorProto;
 class EnumDescriptorProto;
@@ -340,6 +338,9 @@ class LIBPROTOBUF_EXPORT Descriptor {
   struct ExtensionRange {
     typedef ExtensionRangeOptions OptionsType;
 
+    // See Descriptor::CopyTo().
+    void CopyTo(DescriptorProto_ExtensionRange* proto) const;
+
     int start;  // inclusive
     int end;    // exclusive
 
@@ -1802,7 +1803,7 @@ class LIBPROTOBUF_EXPORT DescriptorPool {
   // This class contains a lot of hash maps with complicated types that
   // we'd like to keep out of the header.
   class Tables;
-  google::protobuf::scoped_ptr<Tables> tables_;
+  std::unique_ptr<Tables> tables_;
 
   bool enforce_dependencies_;
   bool lazily_build_dependencies_;