diff options
| author | Adam Cozzette <acozzette@google.com> | 2018-01-19 16:46:57 -0800 |
|---|---|---|
| committer | Adam Cozzette <acozzette@acozzette0.svl.corp.google.com> | 2018-01-26 16:17:14 -0800 |
| commit | 39a789e657a52e835c281233b63cc2a6bb387fd4 (patch) | |
| tree | 18954017db14eb09c290ddbe0425a212b14d2b28 /src/google/protobuf/compiler/csharp | |
| parent | c236896ec5a7f9c0b021f14be61ee2e0a2c7a91b (diff) | |
| download | protobuf-39a789e657a52e835c281233b63cc2a6bb387fd4.tar.gz protobuf-39a789e657a52e835c281233b63cc2a6bb387fd4.tar.bz2 protobuf-39a789e657a52e835c281233b63cc2a6bb387fd4.zip | |
Removed using statements from common.h
These statements pulled a bunch of symbols from the std namespace into
the global namespace. This commit removes all of them except for
std::string, which is a bit trickier to remove.
Diffstat (limited to 'src/google/protobuf/compiler/csharp')
| -rw-r--r-- | src/google/protobuf/compiler/csharp/csharp_doc_comment.cc | 2 | ||||
| -rw-r--r-- | src/google/protobuf/compiler/csharp/csharp_generator.cc | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/google/protobuf/compiler/csharp/csharp_doc_comment.cc b/src/google/protobuf/compiler/csharp/csharp_doc_comment.cc index 636a76a0..a21dc0a4 100644 --- a/src/google/protobuf/compiler/csharp/csharp_doc_comment.cc +++ b/src/google/protobuf/compiler/csharp/csharp_doc_comment.cc @@ -56,7 +56,7 @@ void WriteDocCommentBodyImpl(io::Printer* printer, SourceLocation location) { // node of a summary element, not part of an attribute. comments = StringReplace(comments, "&", "&", true); comments = StringReplace(comments, "<", "<", true); - vector<string> lines = Split(comments, "\n", false /* skip_empty */); + std::vector<string> lines = Split(comments, "\n", false /* skip_empty */); // TODO: We really should work out which part to put in the summary and which to put in the remarks... // but that needs to be part of a bigger effort to understand the markdown better anyway. printer->Print("/// <summary>\n"); diff --git a/src/google/protobuf/compiler/csharp/csharp_generator.cc b/src/google/protobuf/compiler/csharp/csharp_generator.cc index c13ed65b..5418127f 100644 --- a/src/google/protobuf/compiler/csharp/csharp_generator.cc +++ b/src/google/protobuf/compiler/csharp/csharp_generator.cc @@ -64,7 +64,7 @@ bool Generator::Generate( GeneratorContext* generator_context, string* error) const { - vector<pair<string, string> > options; + std::vector<std::pair<string, string> > options; ParseGeneratorParameter(parameter, &options); // We only support proto3 - but we make an exception for descriptor.proto. |