AuroraMiddleware/protobuf
1
0
Fork 0
Code Issues 1 Pull Requests Projects Releases Wiki Activity

Removed unnecessary includes of well-known types from PHP generator. (#7311)

Browse Source 
* Removed unnecessary includes of well-known types from PHP generator.

* Changed some split calls to work properly with the Copybara import rewrites.
This commit is contained in:
Joshua Haberman 2020-03-18 16:29:29 -07:00 committed by GitHub
parent 53128559ae
commit 4567a21004
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/google/protobuf/compiler/php/php_generator.cc
View File

@ -37,16 +37,6 @@
#include <google/protobuf/io/printer.h>
#include <google/protobuf/io/zero_copy_stream.h>
#include <google/protobuf/stubs/strutil.h>
#include <google/protobuf/any.pb.h>
#include <google/protobuf/api.pb.h>
#include <google/protobuf/duration.pb.h>
#include <google/protobuf/empty.pb.h>
#include <google/protobuf/field_mask.pb.h>
#include <google/protobuf/source_context.pb.h>
#include <google/protobuf/struct.pb.h>
#include <google/protobuf/timestamp.pb.h>
#include <google/protobuf/type.pb.h>
#include <google/protobuf/wrappers.pb.h>
#include <sstream>
@ -1853,11 +1843,12 @@ bool Generator::GenerateAll(const std::vector<const FileDescriptor*>& files,
bool aggregate_metadata = false;
std::set<string> aggregate_metadata_prefixes;
for (const auto& option : Split(parameter, ",")) {
const auto option_pair = Split(option, "=");
for (const auto& option : Split(parameter, ",", true)) {
const std::vector<std::string> option_pair = Split(option, "=", true);
if (HasPrefixString(option_pair[0], "aggregate_metadata")) {
string options_string = option_pair[1];
const auto options = Split(options_string, "#", false);
const std::vector<std::string> options =
Split(options_string, "#", false);
aggregate_metadata = true;
for (int i = 0; i < options.size(); i++) {
aggregate_metadata_prefixes.insert(options[i]);