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_mips.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'disassembler/disassembler_mips.h') diff --git a/disassembler/disassembler_mips.h b/disassembler/disassembler_mips.h index afa6af366f..bc74b43ac9 100644 --- a/disassembler/disassembler_mips.h +++ b/disassembler/disassembler_mips.h @@ -24,7 +24,7 @@ namespace art { namespace mips { -class DisassemblerMips FINAL : public Disassembler { +class DisassemblerMips final : public Disassembler { public: explicit DisassemblerMips(DisassemblerOptions* options, bool is_o32_abi) : Disassembler(options), @@ -33,8 +33,8 @@ class DisassemblerMips FINAL : public Disassembler { is_o32_abi_(is_o32_abi) {} const char* RegName(uint32_t reg); - 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: // Address and encoding of the last disassembled instruction. -- cgit v1.2.3-59-g8ed1b