attempting to upgrade to proto 3.5
This commit is contained in:
1 parent
eb1b42a5e8
commit
cc3510c6c2
368 files changed
+35764
-24867
No files matched your search
@@ -46,6 +46,7 @@
|
||||
#include <google/protobuf/io/printer.h>
|
||||
#include <google/protobuf/io/zero_copy_stream.h>
|
||||
#include <google/protobuf/descriptor.pb.h>
|
||||
#include <google/protobuf/stubs/strutil.h>
|
||||
|
||||
namespace google {
|
||||
namespace protobuf {
|
||||
@@ -84,7 +85,7 @@ bool CppGenerator::Generate(const FileDescriptor* file,
|
||||
// __declspec(dllimport) depending on what is being compiled.
|
||||
//
|
||||
Options file_options;
|
||||
|
||||
bool split_source = false;
|
||||
for (int i = 0; i < options.size(); i++) {
|
||||
if (options[i].first == "dllexport_decl") {
|
||||
file_options.dllexport_decl = options[i].second;
|
||||
@@ -98,8 +99,14 @@ bool CppGenerator::Generate(const FileDescriptor* file,
|
||||
file_options.annotation_guard_name = options[i].second;
|
||||
} else if (options[i].first == "lite") {
|
||||
file_options.enforce_lite = true;
|
||||
} else if (options[i].first == "lite_implicit_weak_fields") {
|
||||
file_options.lite_implicit_weak_fields = true;
|
||||
} else if (options[i].first == "table_driven_parsing") {
|
||||
file_options.table_driven_parsing = true;
|
||||
} else if (options[i].first == "table_driven_serialization") {
|
||||
file_options.table_driven_serialization = true;
|
||||
} else if (options[i].first == "split_source") {
|
||||
split_source = true;
|
||||
} else {
|
||||
*error = "Unknown generator option: " + options[i].first;
|
||||
return false;
|
||||
@@ -133,14 +140,13 @@ bool CppGenerator::Generate(const FileDescriptor* file,
|
||||
}
|
||||
}
|
||||
|
||||
basename.append(".pb");
|
||||
{
|
||||
google::protobuf::scoped_ptr<io::ZeroCopyOutputStream> output(
|
||||
generator_context->Open(basename + ".h"));
|
||||
generator_context->Open(basename + ".pb.h"));
|
||||
GeneratedCodeInfo annotations;
|
||||
io::AnnotationProtoCollector<GeneratedCodeInfo> annotation_collector(
|
||||
&annotations);
|
||||
string info_path = basename + ".h.meta";
|
||||
string info_path = basename + ".pb.h.meta";
|
||||
io::Printer printer(output.get(), '$', file_options.annotate_headers
|
||||
? &annotation_collector
|
||||
: NULL);
|
||||
@@ -154,9 +160,24 @@ bool CppGenerator::Generate(const FileDescriptor* file,
|
||||
}
|
||||
|
||||
// Generate cc file.
|
||||
{
|
||||
if (split_source) {
|
||||
{
|
||||
// This is the global .cc file, containing enum/services/tables/reflection
|
||||
google::protobuf::scoped_ptr<io::ZeroCopyOutputStream> output(
|
||||
generator_context->Open(basename + ".pb.cc"));
|
||||
io::Printer printer(output.get(), '$');
|
||||
file_generator.GenerateGlobalSource(&printer);
|
||||
}
|
||||
for (int i = 0; i < file_generator.NumMessages(); i++) {
|
||||
// TODO(gerbens) Agree on naming scheme.
|
||||
google::protobuf::scoped_ptr<io::ZeroCopyOutputStream> output(
|
||||
generator_context->Open(basename + "." + SimpleItoa(i) + ".cc"));
|
||||
io::Printer printer(output.get(), '$');
|
||||
file_generator.GenerateSourceForMessage(i, &printer);
|
||||
}
|
||||
} else {
|
||||
google::protobuf::scoped_ptr<io::ZeroCopyOutputStream> output(
|
||||
generator_context->Open(basename + ".cc"));
|
||||
generator_context->Open(basename + ".pb.cc"));
|
||||
io::Printer printer(output.get(), '$');
|
||||
file_generator.GenerateSource(&printer);
|
||||
}
|
||||
|
||||
Reference in new issue
Block a user