Index: third_party/protobuf/src/google/protobuf/compiler/cpp/cpp_file.h |
=================================================================== |
--- third_party/protobuf/src/google/protobuf/compiler/cpp/cpp_file.h (revision 216642) |
+++ third_party/protobuf/src/google/protobuf/compiler/cpp/cpp_file.h (working copy) |
@@ -39,6 +39,7 @@ |
#include <vector> |
#include <google/protobuf/stubs/common.h> |
#include <google/protobuf/compiler/cpp/cpp_field.h> |
+#include <google/protobuf/compiler/cpp/cpp_options.h> |
namespace google { |
namespace protobuf { |
@@ -61,7 +62,7 @@ |
public: |
// See generator.cc for the meaning of dllexport_decl. |
explicit FileGenerator(const FileDescriptor* file, |
- const string& dllexport_decl); |
+ const Options& options); |
~FileGenerator(); |
void GenerateHeader(io::Printer* printer); |
@@ -85,7 +86,7 @@ |
// E.g. if the package is foo.bar, package_parts_ is {"foo", "bar"}. |
vector<string> package_parts_; |
- string dllexport_decl_; |
+ const Options options_; |
GOOGLE_DISALLOW_EVIL_CONSTRUCTORS(FileGenerator); |
}; |