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.h | |
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.h')
-rw-r--r-- | src/google/protobuf/compiler/csharp/csharp_field_base.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/google/protobuf/compiler/csharp/csharp_field_base.h b/src/google/protobuf/compiler/csharp/csharp_field_base.h index 4109f3ca..df26853b 100644 --- a/src/google/protobuf/compiler/csharp/csharp_field_base.h +++ b/src/google/protobuf/compiler/csharp/csharp_field_base.h @@ -66,14 +66,14 @@ class FieldGeneratorBase : public SourceGeneratorBase { protected: const FieldDescriptor* descriptor_; const int fieldOrdinal_; - map<string, string> variables_; + std::map<string, string> variables_; void AddDeprecatedFlag(io::Printer* printer); void AddNullCheck(io::Printer* printer); void AddNullCheck(io::Printer* printer, const std::string& name); void AddPublicMemberAttributes(io::Printer* printer); - void SetCommonOneofFieldVariables(map<string, string>* variables); + void SetCommonOneofFieldVariables(std::map<string, string>* variables); std::string oneof_property_name(); std::string oneof_name(); @@ -89,7 +89,7 @@ class FieldGeneratorBase : public SourceGeneratorBase { std::string capitalized_type_name(); private: - void SetCommonFieldVariables(map<string, string>* variables); + void SetCommonFieldVariables(std::map<string, string>* variables); std::string GetStringDefaultValueInternal(); std::string GetBytesDefaultValueInternal(); |