diff options
author | Jeff Davidson <jpd@google.com> | 2015-01-16 00:06:01 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2015-01-16 00:06:01 +0000 |
commit | c346ca161fce1976ee044960d7b0316767a91d31 (patch) | |
tree | 3cecb8acc160fc13944e75d1d97af0afcbd4edc4 /src/google/protobuf/compiler/cpp/cpp_message.h | |
parent | b2a9d4321578139677c146ce37eba5e27e8f5c79 (diff) | |
parent | c4616e7140586f06dce57a7fe970a22832f50ccc (diff) | |
download | external_protobuf-c346ca161fce1976ee044960d7b0316767a91d31.zip external_protobuf-c346ca161fce1976ee044960d7b0316767a91d31.tar.gz external_protobuf-c346ca161fce1976ee044960d7b0316767a91d31.tar.bz2 |
am c4616e71: am 77a6b2f4: Merge "Update protobuf library from 2.3 to 2.6."
* commit 'c4616e7140586f06dce57a7fe970a22832f50ccc':
Update protobuf library from 2.3 to 2.6.
Diffstat (limited to 'src/google/protobuf/compiler/cpp/cpp_message.h')
-rw-r--r-- | src/google/protobuf/compiler/cpp/cpp_message.h | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/src/google/protobuf/compiler/cpp/cpp_message.h b/src/google/protobuf/compiler/cpp/cpp_message.h index 04778f6..3b4085d 100644 --- a/src/google/protobuf/compiler/cpp/cpp_message.h +++ b/src/google/protobuf/compiler/cpp/cpp_message.h @@ -35,9 +35,11 @@ #ifndef GOOGLE_PROTOBUF_COMPILER_CPP_MESSAGE_H__ #define GOOGLE_PROTOBUF_COMPILER_CPP_MESSAGE_H__ +#include <memory> #include <string> -#include <google/protobuf/stubs/common.h> +#include <vector> #include <google/protobuf/compiler/cpp/cpp_field.h> +#include <google/protobuf/compiler/cpp/cpp_options.h> namespace google { namespace protobuf { @@ -57,7 +59,7 @@ class MessageGenerator { public: // See generator.cc for the meaning of dllexport_decl. explicit MessageGenerator(const Descriptor* descriptor, - const string& dllexport_decl); + const Options& options); ~MessageGenerator(); // Header stuff. @@ -131,6 +133,7 @@ class MessageGenerator { // Generate standard Message methods. void GenerateClear(io::Printer* printer); + void GenerateOneofClear(io::Printer* printer); void GenerateMergeFromCodedStream(io::Printer* printer); void GenerateSerializeWithCachedSizes(io::Printer* printer); void GenerateSerializeWithCachedSizesToArray(io::Printer* printer); @@ -153,11 +156,13 @@ class MessageGenerator { const Descriptor* descriptor_; string classname_; - string dllexport_decl_; + Options options_; FieldGeneratorMap field_generators_; + vector< vector<string> > runs_of_fields_; // that might be trivially cleared scoped_array<scoped_ptr<MessageGenerator> > nested_generators_; scoped_array<scoped_ptr<EnumGenerator> > enum_generators_; scoped_array<scoped_ptr<ExtensionGenerator> > extension_generators_; + bool uses_string_; GOOGLE_DISALLOW_EVIL_CONSTRUCTORS(MessageGenerator); }; |