diff options
| author | 2018-09-25 00:36:43 +0000 | |
|---|---|---|
| committer | 2018-09-25 00:36:43 +0000 | |
| commit | fc4b2eaa427e43a51c6f39ffecac0ef4fa732b61 (patch) | |
| tree | b6bc4cd9bc846ae40eac280dbc2c9514e05a0f7b /runtime/class_linker.cc | |
| parent | 26f048f48cdb1e884aab2b6fddf26d58346d29ad (diff) | |
| parent | c55bb390d88b8eb62a50932f7f9b47c2a3733f16 (diff) | |
Merge "Revert^2 "ART: Refactor typedef to using""
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, |