summaryrefslogtreecommitdiffstats
path: root/profman
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 /profman
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 'profman')
-rw-r--r--profman/profile_assistant_test.cc2
-rw-r--r--profman/profman.cc2
2 files changed, 2 insertions, 2 deletions
diff --git a/profman/profile_assistant_test.cc b/profman/profile_assistant_test.cc
index 370f59dc8a..286b6867a3 100644
--- a/profman/profile_assistant_test.cc
+++ b/profman/profile_assistant_test.cc
@@ -40,7 +40,7 @@ static constexpr size_t kMaxMethodIds = 65535;
class ProfileAssistantTest : public CommonRuntimeTest {
public:
- void PostRuntimeCreate() OVERRIDE {
+ void PostRuntimeCreate() override {
allocator_.reset(new ArenaAllocator(Runtime::Current()->GetArenaPool()));
}
diff --git a/profman/profman.cc b/profman/profman.cc
index 9b470973c6..cecd3c2d63 100644
--- a/profman/profman.cc
+++ b/profman/profman.cc
@@ -185,7 +185,7 @@ NO_RETURN static void Abort(const char* msg) {
// TODO(calin): This class has grown too much from its initial design. Split the functionality
// into smaller, more contained pieces.
-class ProfMan FINAL {
+class ProfMan final {
public:
ProfMan() :
reference_profile_file_fd_(kInvalidFd),