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/javanano/javanano_helpers.h | |
| parent | b9c4daadf7e27c0a533f86d567a89b691aa0ad9f (diff) | |
Add std:: namespace prefix to set and map (#3332)
* Remove using std::{set,map}
Diffstat (limited to 'src/google/protobuf/compiler/javanano/javanano_helpers.h')
| -rw-r--r-- | src/google/protobuf/compiler/javanano/javanano_helpers.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/google/protobuf/compiler/javanano/javanano_helpers.h b/src/google/protobuf/compiler/javanano/javanano_helpers.h index 014c85ae..04b2d633 100644 --- a/src/google/protobuf/compiler/javanano/javanano_helpers.h +++ b/src/google/protobuf/compiler/javanano/javanano_helpers.h @@ -181,7 +181,7 @@ string GenerateDifferentBit(int bit_index); // the given name of the bit, to the appropriate Java expressions for the given // bit index. void SetBitOperationVariables(const string name, - int bitIndex, map<string, string>* variables); + int bitIndex, std::map<string, string>* variables); inline bool IsMapEntry(const Descriptor* descriptor) { // TODO(liujisi): Add an option to turn on maps for proto2 syntax as well. |