summaryrefslogtreecommitdiff
path: root/compiler/utils/jni_macro_assembler_test.h
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 /compiler/utils/jni_macro_assembler_test.h
parent19379b58bd433da91230e4fe6cd96e7416d16adc (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 'compiler/utils/jni_macro_assembler_test.h')
-rw-r--r--compiler/utils/jni_macro_assembler_test.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/compiler/utils/jni_macro_assembler_test.h b/compiler/utils/jni_macro_assembler_test.h
index b70c18b3e2..067a5953b8 100644
--- a/compiler/utils/jni_macro_assembler_test.h
+++ b/compiler/utils/jni_macro_assembler_test.h
@@ -58,7 +58,7 @@ class JNIMacroAssemblerTest : public testing::Test {
protected:
JNIMacroAssemblerTest() {}
- void SetUp() OVERRIDE {
+ void SetUp() override {
allocator_.reset(new ArenaAllocator(&pool_));
assembler_.reset(CreateAssembler(allocator_.get()));
test_helper_.reset(
@@ -74,7 +74,7 @@ class JNIMacroAssemblerTest : public testing::Test {
SetUpHelpers();
}
- void TearDown() OVERRIDE {
+ void TearDown() override {
test_helper_.reset(); // Clean up the helper.
assembler_.reset();
allocator_.reset();