Index: third_party/protobuf/src/google/protobuf/compiler/java/java_file.h |
diff --git a/third_party/protobuf/src/google/protobuf/compiler/java/java_file.h b/third_party/protobuf/src/google/protobuf/compiler/java/java_file.h |
index 7dbeb94eaf0cb1e0384c80b802561d76e597d6d0..e95aef0912d569a35b9f4df9d3c376a7abcf8453 100644 |
--- a/third_party/protobuf/src/google/protobuf/compiler/java/java_file.h |
+++ b/third_party/protobuf/src/google/protobuf/compiler/java/java_file.h |
@@ -42,6 +42,7 @@ |
#include <string> |
#include <vector> |
#include <google/protobuf/stubs/common.h> |
+#include <google/protobuf/compiler/java/java_options.h> |
namespace google { |
namespace protobuf { |
@@ -67,8 +68,8 @@ namespace java { |
class FileGenerator { |
public: |
- FileGenerator(const FileDescriptor* file, bool immutable_api = true, |
- bool enforce_lite = false); |
+ FileGenerator(const FileDescriptor* file, const Options& options, |
+ bool immutable_api = true); |
~FileGenerator(); |
// Checks for problems that would otherwise lead to cryptic compile errors. |
@@ -83,12 +84,12 @@ class FileGenerator { |
// service type). |
void GenerateSiblings(const string& package_dir, |
GeneratorContext* generator_context, |
- vector<string>* file_list); |
+ std::vector<string>* file_list, |
+ std::vector<string>* annotation_list); |
const string& java_package() { return java_package_; } |
const string& classname() { return classname_; } |
- |
private: |
void GenerateDescriptorInitializationCodeForImmutable(io::Printer* printer); |
void GenerateDescriptorInitializationCodeForMutable(io::Printer* printer); |
@@ -105,9 +106,9 @@ class FileGenerator { |
google::protobuf::scoped_ptr<GeneratorFactory> generator_factory_; |
google::protobuf::scoped_ptr<Context> context_; |
ClassNameResolver* name_resolver_; |
+ const Options options_; |
bool immutable_api_; |
- |
GOOGLE_DISALLOW_EVIL_CONSTRUCTORS(FileGenerator); |
}; |