diff options
author | tanderson-google <thomasanderson@google.com> | 2017-07-09 20:31:50 -0700 |
---|---|---|
committer | Adam Cozzette <acozzette@gmail.com> | 2017-07-09 20:31:50 -0700 |
commit | 126082c371d2320255ac8ff7d68bef25a919572d (patch) | |
tree | 72bf0b5b5d8ee5249d2128bc91936733eb42294b /src/google/protobuf/compiler/csharp/csharp_field_base.cc | |
parent | b9c4daadf7e27c0a533f86d567a89b691aa0ad9f (diff) | |
download | protobuf-126082c371d2320255ac8ff7d68bef25a919572d.tar.gz protobuf-126082c371d2320255ac8ff7d68bef25a919572d.tar.bz2 protobuf-126082c371d2320255ac8ff7d68bef25a919572d.zip |
Add std:: namespace prefix to set and map (#3332)
* Remove using std::{set,map}
Diffstat (limited to 'src/google/protobuf/compiler/csharp/csharp_field_base.cc')
-rw-r--r-- | src/google/protobuf/compiler/csharp/csharp_field_base.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/google/protobuf/compiler/csharp/csharp_field_base.cc b/src/google/protobuf/compiler/csharp/csharp_field_base.cc index ebb8fbc2..ecf29ece 100644 --- a/src/google/protobuf/compiler/csharp/csharp_field_base.cc +++ b/src/google/protobuf/compiler/csharp/csharp_field_base.cc @@ -54,7 +54,7 @@ namespace compiler { namespace csharp { void FieldGeneratorBase::SetCommonFieldVariables( - map<string, string>* variables) { + std::map<string, string>* variables) { // Note: this will be valid even though the tag emitted for packed and unpacked versions of // repeated fields varies by wire format. The wire format is encoded in the bottom 3 bits, which // never effects the tag size. @@ -92,7 +92,7 @@ void FieldGeneratorBase::SetCommonFieldVariables( } void FieldGeneratorBase::SetCommonOneofFieldVariables( - map<string, string>* variables) { + std::map<string, string>* variables) { (*variables)["oneof_name"] = oneof_name(); (*variables)["has_property_check"] = oneof_name() + "Case_ == " + oneof_property_name() + |