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 455c239a936bd9cec724ab65e85092b743fa1070..473eb4e6fba5b9b85f33e1887ffae7bd5959be9f 100644 |
--- a/third_party/protobuf/src/google/protobuf/compiler/code_generator.cc |
+++ b/third_party/protobuf/src/google/protobuf/compiler/code_generator.cc |
@@ -1,6 +1,6 @@ |
// Protocol Buffers - Google's data interchange format |
// Copyright 2008 Google Inc. All rights reserved. |
-// http://code.google.com/p/protobuf/ |
+// https://developers.google.com/protocol-buffers/ |
// |
// Redistribution and use in source and binary forms, with or without |
// modification, are permitted provided that the following conditions are |
@@ -34,6 +34,7 @@ |
#include <google/protobuf/compiler/code_generator.h> |
+#include <google/protobuf/stubs/logging.h> |
#include <google/protobuf/stubs/common.h> |
#include <google/protobuf/stubs/strutil.h> |
@@ -44,6 +45,11 @@ namespace compiler { |
CodeGenerator::~CodeGenerator() {} |
GeneratorContext::~GeneratorContext() {} |
+io::ZeroCopyOutputStream* |
+GeneratorContext::OpenForAppend(const string& filename) { |
+ return NULL; |
+} |
+ |
io::ZeroCopyOutputStream* GeneratorContext::OpenForInsert( |
const string& filename, const string& insertion_point) { |
GOOGLE_LOG(FATAL) << "This GeneratorContext does not support insertion."; |
@@ -58,8 +64,7 @@ void GeneratorContext::ListParsedFiles( |
// Parses a set of comma-delimited name/value pairs. |
void ParseGeneratorParameter(const string& text, |
vector<pair<string, string> >* output) { |
- vector<string> parts; |
- SplitStringUsing(text, ",", &parts); |
+ vector<string> parts = Split(text, ",", true); |
for (int i = 0; i < parts.size(); i++) { |
string::size_type equals_pos = parts[i].find_first_of('='); |