diff options
author | 2018-08-24 16:58:47 +0100 | |
---|---|---|
committer | 2018-08-28 11:06:07 +0100 | |
commit | bbc6e7edb5fca4a61ac53dd9bce79cb4f0bb3403 (patch) | |
tree | 0fbce767bc383358cf4cd65aafc74140e1850982 /openjdkjvmti/transform.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 'openjdkjvmti/transform.cc')
-rw-r--r-- | openjdkjvmti/transform.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/openjdkjvmti/transform.cc b/openjdkjvmti/transform.cc index 8797553b07..d87ca56b85 100644 --- a/openjdkjvmti/transform.cc +++ b/openjdkjvmti/transform.cc @@ -68,7 +68,7 @@ namespace openjdkjvmti { // A FaultHandler that will deal with initializing ClassDefinitions when they are actually needed. -class TransformationFaultHandler FINAL : public art::FaultHandler { +class TransformationFaultHandler final : public art::FaultHandler { public: explicit TransformationFaultHandler(art::FaultManager* manager) : art::FaultHandler(manager), @@ -84,7 +84,7 @@ class TransformationFaultHandler FINAL : public art::FaultHandler { uninitialized_class_definitions_.clear(); } - bool Action(int sig, siginfo_t* siginfo, void* context ATTRIBUTE_UNUSED) OVERRIDE { + bool Action(int sig, siginfo_t* siginfo, void* context ATTRIBUTE_UNUSED) override { DCHECK_EQ(sig, SIGSEGV); art::Thread* self = art::Thread::Current(); if (UNLIKELY(uninitialized_class_definitions_lock_.IsExclusiveHeld(self))) { |