1 files changed, 5 insertions, 12 deletions
diff --git a/src/google/protobuf/compiler/cpp/cpp_message_field.h b/src/google/protobuf/compiler/cpp/cpp_message_field.h
index e165404f..6879539c 100644
--- a/src/google/protobuf/compiler/cpp/cpp_message_field.h
+++ b/src/google/protobuf/compiler/cpp/cpp_message_field.h
@@ -38,18 +38,17 @@
 #include <map>
 #include <string>
 #include <google/protobuf/compiler/cpp/cpp_field.h>
+#include <google/protobuf/compiler/cpp/cpp_helpers.h>
 
 namespace google {
 namespace protobuf {
 namespace compiler {
 namespace cpp {
 
-bool IsImplicitWeakField(const FieldDescriptor* field, const Options& options);
-
 class MessageFieldGenerator : public FieldGenerator {
  public:
   MessageFieldGenerator(const FieldDescriptor* descriptor,
-                        const Options& options);
+                        const Options& options, SCCAnalyzer* scc_analyzer);
   ~MessageFieldGenerator();
 
   // implements FieldGenerator ---------------------------------------
@@ -81,7 +80,7 @@ class MessageFieldGenerator : public FieldGenerator {
 class MessageOneofFieldGenerator : public MessageFieldGenerator {
  public:
   MessageOneofFieldGenerator(const FieldDescriptor* descriptor,
-                             const Options& options);
+                             const Options& options, SCCAnalyzer* scc_analyzer);
   ~MessageOneofFieldGenerator();
 
   // implements FieldGenerator ---------------------------------------
@@ -97,21 +96,19 @@ class MessageOneofFieldGenerator : public MessageFieldGenerator {
   void GenerateConstructorCode(io::Printer* printer) const;
 
  private:
-  const bool dependent_base_;
   GOOGLE_DISALLOW_EVIL_CONSTRUCTORS(MessageOneofFieldGenerator);
 };
 
 class RepeatedMessageFieldGenerator : public FieldGenerator {
  public:
   RepeatedMessageFieldGenerator(const FieldDescriptor* descriptor,
-                                const Options& options);
+                                const Options& options,
+                                SCCAnalyzer* scc_analyzer);
   ~RepeatedMessageFieldGenerator();
 
   // implements FieldGenerator ---------------------------------------
   void GeneratePrivateMembers(io::Printer* printer) const;
-  void GenerateDependentAccessorDeclarations(io::Printer* printer) const;
   void GenerateAccessorDeclarations(io::Printer* printer) const;
-  void GenerateDependentInlineAccessorDefinitions(io::Printer* printer) const;
   void GenerateInlineAccessorDefinitions(io::Printer* printer) const;
   void GenerateClearingCode(io::Printer* printer) const;
   void GenerateMergingCode(io::Printer* printer) const;
@@ -124,11 +121,7 @@ class RepeatedMessageFieldGenerator : public FieldGenerator {
   void GenerateByteSize(io::Printer* printer) const;
 
  private:
-  void InternalGenerateTypeDependentAccessorDeclarations(
-      io::Printer* printer) const;
-
   const FieldDescriptor* descriptor_;
-  const bool dependent_field_;
   const bool implicit_weak_field_;
   std::map<string, string> variables_;