diff options
| author | 2018-09-20 04:59:30 +0000 | |
|---|---|---|
| committer | 2018-09-20 04:59:30 +0000 | |
| commit | 144f0826919bf7af915bd165fc67eb12aead843c (patch) | |
| tree | 7e55557e118eb5fffe03ad3456e00d8469a36232 /runtime/class_linker.cc | |
| parent | 4727396c867c6b4641f5bb0edb925d554379ae8e (diff) | |
| parent | 9a20ff06f7ccee08a742c315ec6d351ab56ba1cd (diff) | |
Merge changes If50d37b5,I0f40f91c,I02e8702c
* changes:
ART: Refactor typedef to using
ART: Fix dexdump & dexlist
ART: Add redundant-void-arg check
Diffstat (limited to 'runtime/class_linker.cc')
| -rw-r--r-- | runtime/class_linker.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/runtime/class_linker.cc b/runtime/class_linker.cc index befeea463a..d9daae7b21 100644 --- a/runtime/class_linker.cc +++ b/runtime/class_linker.cc @@ -307,7 +307,7 @@ struct FieldGapsComparator { return lhs.size < rhs.size || (lhs.size == rhs.size && lhs.start_offset > rhs.start_offset); } }; -typedef std::priority_queue<FieldGap, std::vector<FieldGap>, FieldGapsComparator> FieldGaps; +using FieldGaps = std::priority_queue<FieldGap, std::vector<FieldGap>, FieldGapsComparator>; // Adds largest aligned gaps to queue of gaps. static void AddFieldGap(uint32_t gap_start, uint32_t gap_end, FieldGaps* gaps) { @@ -2301,7 +2301,7 @@ ObjPtr<mirror::Class> ClassLinker::EnsureResolved(Thread* self, return klass; } -typedef std::pair<const DexFile*, const DexFile::ClassDef*> ClassPathEntry; +using ClassPathEntry = std::pair<const DexFile*, const DexFile::ClassDef*>; // Search a collection of DexFiles for a descriptor ClassPathEntry FindInClassPath(const char* descriptor, |