Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(53)

Unified Diff: third_party/protobuf/src/google/protobuf/compiler/code_generator.cc

Issue 2590803003: Revert "third_party/protobuf: Update to HEAD (83d681ee2c)" (Closed)
Patch Set: Created 4 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: third_party/protobuf/src/google/protobuf/compiler/code_generator.cc
diff --git a/third_party/protobuf/src/google/protobuf/compiler/code_generator.cc b/third_party/protobuf/src/google/protobuf/compiler/code_generator.cc
index 11d0f33432c9d3b65f1b7d5dc83db56a1ae04d50..473eb4e6fba5b9b85f33e1887ffae7bd5959be9f 100644
--- a/third_party/protobuf/src/google/protobuf/compiler/code_generator.cc
+++ b/third_party/protobuf/src/google/protobuf/compiler/code_generator.cc
@@ -34,10 +34,8 @@
#include <google/protobuf/compiler/code_generator.h>
-#include <google/protobuf/compiler/plugin.pb.h>
#include <google/protobuf/stubs/logging.h>
#include <google/protobuf/stubs/common.h>
-#include <google/protobuf/descriptor.h>
#include <google/protobuf/stubs/strutil.h>
namespace google {
@@ -45,33 +43,6 @@ namespace protobuf {
namespace compiler {
CodeGenerator::~CodeGenerator() {}
-
-bool CodeGenerator::GenerateAll(
- const std::vector<const FileDescriptor*>& files,
- const string& parameter,
- GeneratorContext* generator_context,
- string* error) const {
- // Default implemenation is just to call the per file method, and prefix any
- // error string with the file to provide context.
- bool succeeded = true;
- for (int i = 0; i < files.size(); i++) {
- const FileDescriptor* file = files[i];
- succeeded = Generate(file, parameter, generator_context, error);
- if (!succeeded && error && error->empty()) {
- *error = "Code generator returned false but provided no error "
- "description.";
- }
- if (error && !error->empty()) {
- *error = file->name() + ": " + *error;
- break;
- }
- if (!succeeded) {
- break;
- }
- }
- return succeeded;
-}
-
GeneratorContext::~GeneratorContext() {}
io::ZeroCopyOutputStream*
@@ -86,25 +57,18 @@ io::ZeroCopyOutputStream* GeneratorContext::OpenForInsert(
}
void GeneratorContext::ListParsedFiles(
- std::vector<const FileDescriptor*>* output) {
+ vector<const FileDescriptor*>* output) {
GOOGLE_LOG(FATAL) << "This GeneratorContext does not support ListParsedFiles";
}
-void GeneratorContext::GetCompilerVersion(Version* version) const {
- version->set_major(GOOGLE_PROTOBUF_VERSION / 1000000);
- version->set_minor(GOOGLE_PROTOBUF_VERSION / 1000 % 1000);
- version->set_patch(GOOGLE_PROTOBUF_VERSION % 1000);
- version->set_suffix(GOOGLE_PROTOBUF_VERSION_SUFFIX);
-}
-
// Parses a set of comma-delimited name/value pairs.
void ParseGeneratorParameter(const string& text,
- std::vector<std::pair<string, string> >* output) {
- std::vector<string> parts = Split(text, ",", true);
+ vector<pair<string, string> >* output) {
+ vector<string> parts = Split(text, ",", true);
for (int i = 0; i < parts.size(); i++) {
string::size_type equals_pos = parts[i].find_first_of('=');
- std::pair<string, string> value;
+ pair<string, string> value;
if (equals_pos == string::npos) {
value.first = parts[i];
value.second = "";

Powered by Google App Engine
This is Rietveld 408576698