diff options
author | 2018-08-24 16:58:47 +0100 | |
---|---|---|
committer | 2018-08-28 11:06:07 +0100 | |
commit | bbc6e7edb5fca4a61ac53dd9bce79cb4f0bb3403 (patch) | |
tree | 0fbce767bc383358cf4cd65aafc74140e1850982 /libdexfile/dex/dex_file_loader.cc | |
parent | 19379b58bd433da91230e4fe6cd96e7416d16adc (diff) |
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 'libdexfile/dex/dex_file_loader.cc')
-rw-r--r-- | libdexfile/dex/dex_file_loader.cc | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/libdexfile/dex/dex_file_loader.cc b/libdexfile/dex/dex_file_loader.cc index 6d9ca4aafa..d9e483d643 100644 --- a/libdexfile/dex/dex_file_loader.cc +++ b/libdexfile/dex/dex_file_loader.cc @@ -36,21 +36,21 @@ namespace { class VectorContainer : public DexFileContainer { public: explicit VectorContainer(std::vector<uint8_t>&& vector) : vector_(std::move(vector)) { } - virtual ~VectorContainer() OVERRIDE { } + virtual ~VectorContainer() override { } - int GetPermissions() OVERRIDE { + int GetPermissions() override { return 0; } - bool IsReadOnly() OVERRIDE { + bool IsReadOnly() override { return true; } - bool EnableWrite() OVERRIDE { + bool EnableWrite() override { return false; } - bool DisableWrite() OVERRIDE { + bool DisableWrite() override { return false; } |