summaryrefslogtreecommitdiffstats
path: root/runtime/stack.cc
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 /runtime/stack.cc
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 'runtime/stack.cc')
-rw-r--r--runtime/stack.cc6
1 files changed, 3 insertions, 3 deletions
diff --git a/runtime/stack.cc b/runtime/stack.cc
index ce99fb9591..eb9c661d18 100644
--- a/runtime/stack.cc
+++ b/runtime/stack.cc
@@ -461,7 +461,7 @@ size_t StackVisitor::ComputeNumFrames(Thread* thread, StackWalkKind walk_kind) {
NumFramesVisitor(Thread* thread_in, StackWalkKind walk_kind_in)
: StackVisitor(thread_in, nullptr, walk_kind_in), frames(0) {}
- bool VisitFrame() OVERRIDE {
+ bool VisitFrame() override {
frames++;
return true;
}
@@ -487,7 +487,7 @@ bool StackVisitor::GetNextMethodAndDexPc(ArtMethod** next_method, uint32_t* next
next_dex_pc_(0) {
}
- bool VisitFrame() OVERRIDE REQUIRES_SHARED(Locks::mutator_lock_) {
+ bool VisitFrame() override REQUIRES_SHARED(Locks::mutator_lock_) {
if (found_frame_) {
ArtMethod* method = GetMethod();
if (method != nullptr && !method->IsRuntimeMethod()) {
@@ -520,7 +520,7 @@ void StackVisitor::DescribeStack(Thread* thread) {
explicit DescribeStackVisitor(Thread* thread_in)
: StackVisitor(thread_in, nullptr, StackVisitor::StackWalkKind::kIncludeInlinedFrames) {}
- bool VisitFrame() OVERRIDE REQUIRES_SHARED(Locks::mutator_lock_) {
+ bool VisitFrame() override REQUIRES_SHARED(Locks::mutator_lock_) {
LOG(INFO) << "Frame Id=" << GetFrameId() << " " << DescribeLocation();
return true;
}