summaryrefslogtreecommitdiffstats
path: root/simulator
diff options
context:
space:
mode:
authorRoland Levillain <rpl@google.com>2018-08-24 16:58:47 +0100
committerRoland Levillain <rpl@google.com>2018-08-28 11:06:07 +0100
commitbbc6e7edb5fca4a61ac53dd9bce79cb4f0bb3403 (patch)
tree0fbce767bc383358cf4cd65aafc74140e1850982 /simulator
parent19379b58bd433da91230e4fe6cd96e7416d16adc (diff)
downloadart-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 'simulator')
-rw-r--r--simulator/code_simulator_arm64.h8
1 files changed, 4 insertions, 4 deletions
diff --git a/simulator/code_simulator_arm64.h b/simulator/code_simulator_arm64.h
index 8b665292af..e726500452 100644
--- a/simulator/code_simulator_arm64.h
+++ b/simulator/code_simulator_arm64.h
@@ -36,11 +36,11 @@ class CodeSimulatorArm64 : public CodeSimulator {
static CodeSimulatorArm64* CreateCodeSimulatorArm64();
virtual ~CodeSimulatorArm64();
- void RunFrom(intptr_t code_buffer) OVERRIDE;
+ void RunFrom(intptr_t code_buffer) override;
- bool GetCReturnBool() const OVERRIDE;
- int32_t GetCReturnInt32() const OVERRIDE;
- int64_t GetCReturnInt64() const OVERRIDE;
+ bool GetCReturnBool() const override;
+ int32_t GetCReturnInt32() const override;
+ int64_t GetCReturnInt64() const override;
private:
CodeSimulatorArm64();