diff options
| author |  Daniel Martin <fizbin@gmail.com> | 2014-11-25 10:37:57 -0500 |
|---|---|---|
| committer |  Daniel Martin <daniel.martin@crowdstrike.com> | 2014-11-25 12:45:17 -0500 |
| commit | e2416caf906a680a27bd89a91f14b2cdcaaa1634 (patch) | |
| tree | cd6b982cca9a8de3e2a78bd3cd06f4abdf71c20a /src/google/protobuf/compiler/java/java_message.h | |
| parent | 99aa0f9e8f1a88def7bdebf1385678559cda0707 (diff) | |
Fix java compilation issues when processing large .proto files
Fix issues 579 and 501 on the code.google.com issues list.
Specifically, large .proto files lead to too much static code, leading to a
compilation error from javac: "code too large". This divides the code used
in static initialization into multiple methods to avoid that error. Also,
this incorporates the fix in issue 501 on the code.google.com issues list
to call registry.add only once per extension.
Diffstat (limited to 'src/google/protobuf/compiler/java/java_message.h')
| -rw-r--r-- | src/google/protobuf/compiler/java/java_message.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/google/protobuf/compiler/java/java_message.h b/src/google/protobuf/compiler/java/java_message.h index 91eb2876..91e529cc 100644 --- a/src/google/protobuf/compiler/java/java_message.h +++ b/src/google/protobuf/compiler/java/java_message.h @@ -68,7 +68,7 @@ class MessageGenerator { // Output code which initializes the static variables generated by // GenerateStaticVariables(). - virtual void GenerateStaticVariableInitializers(io::Printer* printer) = 0; + virtual int GenerateStaticVariableInitializers(io::Printer* printer) = 0; // Generate the class itself. virtual void Generate(io::Printer* printer) = 0; @@ -97,7 +97,7 @@ class ImmutableMessageGenerator : public MessageGenerator { virtual void GenerateInterface(io::Printer* printer); virtual void GenerateExtensionRegistrationCode(io::Printer* printer); virtual void GenerateStaticVariables(io::Printer* printer); - virtual void GenerateStaticVariableInitializers(io::Printer* printer); + virtual int GenerateStaticVariableInitializers(io::Printer* printer); private: enum UseMemoization { @@ -106,7 +106,7 @@ class ImmutableMessageGenerator : public MessageGenerator { }; void GenerateFieldAccessorTable(io::Printer* printer); - void GenerateFieldAccessorTableInitializer(io::Printer* printer); + int GenerateFieldAccessorTableInitializer(io::Printer* printer); void GenerateMessageSerializationMethods(io::Printer* printer); void GenerateParseFromMethods(io::Printer* printer); |