diff options
| author |  Adam Cozzette <acozzette@google.com> | 2017-04-25 17:01:28 -0700 |
|---|---|---|
| committer | Adam Cozzette <acozzette@google.com> | 2017-04-26 08:25:01 -0700 |
| commit | 7c76ac1735a3b8f4523856bbd67588b6ccc7f850 (patch) | |
| tree | b5198d8b815cfc08fdede21cd4a0969837b92930 /src/google/protobuf/compiler/javanano/javanano_message.cc | |
| parent | 4920e27a488976c9993cef686d868a846868eb56 (diff) | |
Remove "using namespace std" from stubs/common.h
This prevents the contents of the std namespace from being effectively
pulled into the top-level namespace in all translation units that
include common.h. I left in individual using statements for a few common
things like std::set and std::map, because it did not seem worth going
through the churn of updating the whole codebase to fix those right now.
Diffstat (limited to 'src/google/protobuf/compiler/javanano/javanano_message.cc')
| -rw-r--r-- | src/google/protobuf/compiler/javanano/javanano_message.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/google/protobuf/compiler/javanano/javanano_message.cc b/src/google/protobuf/compiler/javanano/javanano_message.cc index a41da5ae..f81f7f9a 100644 --- a/src/google/protobuf/compiler/javanano/javanano_message.cc +++ b/src/google/protobuf/compiler/javanano/javanano_message.cc @@ -69,7 +69,7 @@ const FieldDescriptor** SortFieldsByNumber(const Descriptor* descriptor) { for (int i = 0; i < descriptor->field_count(); i++) { fields[i] = descriptor->field(i); } - sort(fields, fields + descriptor->field_count(), + std::sort(fields, fields + descriptor->field_count(), FieldOrderingByNumber()); return fields; } |