From bbc6e7edb5fca4a61ac53dd9bce79cb4f0bb3403 Mon Sep 17 00:00:00 2001 From: Roland Levillain Date: Fri, 24 Aug 2018 16:58:47 +0100 Subject: Use 'final' and 'override' specifiers directly in ART. Remove all uses of macros 'FINAL' and 'OVERRIDE' and replace them with 'final' and 'override' specifiers. Remove all definitions of these macros as well, which were located in these files: - libartbase/base/macros.h - test/913-heaps/heaps.cc - test/ti-agent/ti_macros.h ART is now using C++14; the 'final' and 'override' specifiers have been introduced in C++11. Test: mmma art Change-Id: I256c7758155a71a2940ef2574925a44076feeebf --- disassembler/disassembler_x86.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'disassembler/disassembler_x86.h') diff --git a/disassembler/disassembler_x86.h b/disassembler/disassembler_x86.h index 31b62bccf2..a329280b70 100644 --- a/disassembler/disassembler_x86.h +++ b/disassembler/disassembler_x86.h @@ -24,13 +24,13 @@ namespace x86 { enum RegFile { GPR, MMX, SSE }; -class DisassemblerX86 FINAL : public Disassembler { +class DisassemblerX86 final : public Disassembler { public: DisassemblerX86(DisassemblerOptions* options, bool supports_rex) : Disassembler(options), supports_rex_(supports_rex) {} - size_t Dump(std::ostream& os, const uint8_t* begin) OVERRIDE; - void Dump(std::ostream& os, const uint8_t* begin, const uint8_t* end) OVERRIDE; + size_t Dump(std::ostream& os, const uint8_t* begin) override; + void Dump(std::ostream& os, const uint8_t* begin, const uint8_t* end) override; private: size_t DumpNops(std::ostream& os, const uint8_t* instr); -- cgit v1.2.3-59-g8ed1b