diff options
| author | Roland Levillain <rpl@google.com> | 2018-08-24 16:58:47 +0100 |
|---|---|---|
| committer | Roland Levillain <rpl@google.com> | 2018-08-28 11:06:07 +0100 |
| commit | bbc6e7edb5fca4a61ac53dd9bce79cb4f0bb3403 (patch) | |
| tree | 0fbce767bc383358cf4cd65aafc74140e1850982 /compiler/debug/dwarf | |
| parent | 19379b58bd433da91230e4fe6cd96e7416d16adc (diff) | |
| download | art-bbc6e7edb5fca4a61ac53dd9bce79cb4f0bb3403.tar.gz art-bbc6e7edb5fca4a61ac53dd9bce79cb4f0bb3403.tar.bz2 art-bbc6e7edb5fca4a61ac53dd9bce79cb4f0bb3403.zip | |
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
Diffstat (limited to 'compiler/debug/dwarf')
| -rw-r--r-- | compiler/debug/dwarf/debug_abbrev_writer.h | 2 | ||||
| -rw-r--r-- | compiler/debug/dwarf/debug_info_entry_writer.h | 2 | ||||
| -rw-r--r-- | compiler/debug/dwarf/debug_line_opcode_writer.h | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/compiler/debug/dwarf/debug_abbrev_writer.h b/compiler/debug/dwarf/debug_abbrev_writer.h index cccca255c1..63a049b2cc 100644 --- a/compiler/debug/dwarf/debug_abbrev_writer.h +++ b/compiler/debug/dwarf/debug_abbrev_writer.h @@ -37,7 +37,7 @@ namespace dwarf { // determines all the attributes and their format. // It is possible to think of them as type definitions. template <typename Vector = std::vector<uint8_t>> -class DebugAbbrevWriter FINAL : private Writer<Vector> { +class DebugAbbrevWriter final : private Writer<Vector> { static_assert(std::is_same<typename Vector::value_type, uint8_t>::value, "Invalid value type"); public: diff --git a/compiler/debug/dwarf/debug_info_entry_writer.h b/compiler/debug/dwarf/debug_info_entry_writer.h index 89d16f2b2a..b198178d5d 100644 --- a/compiler/debug/dwarf/debug_info_entry_writer.h +++ b/compiler/debug/dwarf/debug_info_entry_writer.h @@ -42,7 +42,7 @@ namespace dwarf { * EndTag(); */ template <typename Vector = std::vector<uint8_t>> -class DebugInfoEntryWriter FINAL : private Writer<Vector> { +class DebugInfoEntryWriter final : private Writer<Vector> { static_assert(std::is_same<typename Vector::value_type, uint8_t>::value, "Invalid value type"); public: diff --git a/compiler/debug/dwarf/debug_line_opcode_writer.h b/compiler/debug/dwarf/debug_line_opcode_writer.h index b4a4d63f01..bb4e87ff7e 100644 --- a/compiler/debug/dwarf/debug_line_opcode_writer.h +++ b/compiler/debug/dwarf/debug_line_opcode_writer.h @@ -31,7 +31,7 @@ namespace dwarf { // * Keep track of current state and convert absolute values to deltas. // * Divide by header-defined factors as appropriate. template<typename Vector = std::vector<uint8_t>> -class DebugLineOpCodeWriter FINAL : private Writer<Vector> { +class DebugLineOpCodeWriter final : private Writer<Vector> { static_assert(std::is_same<typename Vector::value_type, uint8_t>::value, "Invalid value type"); public: |
