Integrated internal changes from Google

This includes all internal changes from around May 20 to now.

1 files changed, 2 insertions, 0 deletions

diff --git a/src/google/protobuf/compiler/cpp/cpp_options.h b/src/google/protobuf/compiler/cpp/cpp_options.h
index ab1d2ed3..ee44fb0a 100644
--- a/src/google/protobuf/compiler/cpp/cpp_options.h
+++ b/src/google/protobuf/compiler/cpp/cpp_options.h
@@ -46,12 +46,14 @@ struct Options {
   Options()
       : safe_boundary_check(false),
         proto_h(false),
+        allow_import_public(true),
         annotate_headers(false),
         enforce_lite(false) {}
 
   string dllexport_decl;
   bool safe_boundary_check;
   bool proto_h;
+  bool allow_import_public;
   bool annotate_headers;
   bool enforce_lite;
   string annotation_pragma_name;