Scope `string` usage with the namespace.

pull/8673/head
Thomas Van Lenten 4 years ago
parent 8275756142
commit f415285c3e
  1. 2
      src/google/protobuf/compiler/objectivec/objectivec_helpers.cc

@ -1745,7 +1745,7 @@ bool ImportWriter::ProtoFrameworkCollector::ConsumeLine(
TrimWhitespace(&proto_file);
if (!proto_file.empty()) {
std::map<std::string, std::string>::iterator existing_entry =
map_->find(string(proto_file));
map_->find(std::string(proto_file));
if (existing_entry != map_->end()) {
std::cerr << "warning: duplicate proto file reference, replacing "
"framework entry for '"

Loading…
Cancel
Save