From 0400cca3236de1ca303af38bf81eab332d042b7c Mon Sep 17 00:00:00 2001
From: Adam Cozzette <acozzette@google.com>
Date: Tue, 13 Mar 2018 16:37:29 -0700
Subject: Integrated internal changes from Google

---
 src/google/protobuf/compiler/cpp/cpp_file.h | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

(limited to 'src/google/protobuf/compiler/cpp/cpp_file.h')

diff --git a/src/google/protobuf/compiler/cpp/cpp_file.h b/src/google/protobuf/compiler/cpp/cpp_file.h
index 7e61cbad..94da9a14 100644
--- a/src/google/protobuf/compiler/cpp/cpp_file.h
+++ b/src/google/protobuf/compiler/cpp/cpp_file.h
@@ -37,9 +37,6 @@
 
 #include <algorithm>
 #include <memory>
-#ifndef _SHARED_PTR_H
-#include <google/protobuf/stubs/shared_ptr.h>
-#endif
 #include <set>
 #include <string>
 #include <vector>
@@ -97,7 +94,7 @@ class FileGenerator {
   void GenerateSourceDefaultInstance(int idx, io::Printer* printer);
 
   void GenerateInitForSCC(const SCC* scc, io::Printer* printer);
-  void GenerateInitializationCode(io::Printer* printer);
+  void GenerateTables(io::Printer* printer);
   void GenerateReflectionInitializationCode(io::Printer* printer);
 
   // For other imports, generates their forward-declarations.
@@ -176,10 +173,10 @@ class FileGenerator {
 
   // These members are just for owning (and thus proper deleting).
   // Nested (enum/extension)_generators are owned by child messages.
-  google::protobuf::scoped_array<google::protobuf::scoped_ptr<EnumGenerator> > enum_generators_owner_;
-  google::protobuf::scoped_array<google::protobuf::scoped_ptr<ServiceGenerator> >
+  std::unique_ptr<std::unique_ptr<EnumGenerator> []> enum_generators_owner_;
+  std::unique_ptr<std::unique_ptr<ServiceGenerator> []>
       service_generators_owner_;
-  google::protobuf::scoped_array<google::protobuf::scoped_ptr<ExtensionGenerator> >
+  std::unique_ptr<std::unique_ptr<ExtensionGenerator> []>
       extension_generators_owner_;
 
   // E.g. if the package is foo.bar, package_parts_ is {"foo", "bar"}.
-- 
cgit v1.2.3