1 files changed, 26 insertions, 2 deletions
diff --git a/src/google/protobuf/compiler/cpp/cpp_options.h b/src/google/protobuf/compiler/cpp/cpp_options.h
index 4463f200..f09885be 100644
--- a/src/google/protobuf/compiler/cpp/cpp_options.h
+++ b/src/google/protobuf/compiler/cpp/cpp_options.h
@@ -39,15 +39,39 @@
 namespace google {
 namespace protobuf {
 namespace compiler {
+class AccessInfoMap;
+
 namespace cpp {
 
 // Generator options (see generator.cc for a description of each):
 struct Options {
-  Options() : safe_boundary_check(false), proto_h(false) {
-  }
+  Options()
+      : safe_boundary_check(false),
+        proto_h(false),
+        transitive_pb_h(true),
+        annotate_headers(false),
+        enforce_lite(false),
+        table_driven_parsing(false),
+        table_driven_serialization(false),
+        lite_implicit_weak_fields(false),
+        bootstrap(false),
+        num_cc_files(0),
+        access_info_map(NULL) {}
+
   string dllexport_decl;
   bool safe_boundary_check;
   bool proto_h;
+  bool transitive_pb_h;
+  bool annotate_headers;
+  bool enforce_lite;
+  bool table_driven_parsing;
+  bool table_driven_serialization;
+  bool lite_implicit_weak_fields;
+  bool bootstrap;
+  int num_cc_files;
+  string annotation_pragma_name;
+  string annotation_guard_name;
+  const AccessInfoMap* access_info_map;
 };
 
 }  // namespace cpp