diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2015-10-12 16:04:04 +0200 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2015-10-12 17:52:29 +0200 |
commit | b36963c0a6a09f70ca6d8d607dd3249a3496497d (patch) | |
tree | 33e06dc8d227957cb31355277fb5cf20b9918628 /salhelper | |
parent | HAVE_CXX11_OVERRIDE is required on all supported toolchains (diff) | |
download | core-b36963c0a6a09f70ca6d8d607dd3249a3496497d.tar.gz core-b36963c0a6a09f70ca6d8d607dd3249a3496497d.zip |
Replace "SAL_OVERRIDE" with "override" in LIBO_INTERNAL_ONLY code
Change-Id: I2ea407acd763ef2d7dae2d3b8f32525523ac8274
Diffstat (limited to 'salhelper')
-rw-r--r-- | salhelper/qa/test_api.cxx | 2 | ||||
-rw-r--r-- | salhelper/source/timer.cxx | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/salhelper/qa/test_api.cxx b/salhelper/qa/test_api.cxx index 2d7905e6b966..686e5cda4617 100644 --- a/salhelper/qa/test_api.cxx +++ b/salhelper/qa/test_api.cxx @@ -64,7 +64,7 @@ public: explicit DerivedCondition(osl::Mutex & mutex): Condition(mutex) {} protected: - virtual bool applies() const SAL_OVERRIDE { return false; } + virtual bool applies() const override { return false; } }; class DerivedConditionWaiterTimedout: diff --git a/salhelper/source/timer.cxx b/salhelper/source/timer.cxx index e4c34d8db1cf..d538b12e5d4f 100644 --- a/salhelper/source/timer.cxx +++ b/salhelper/source/timer.cxx @@ -54,13 +54,13 @@ public: protected: /// worker-function of thread - virtual void SAL_CALL run() SAL_OVERRIDE; + virtual void SAL_CALL run() override; // Checking and triggering of a timer event void SAL_CALL checkForTimeout(); // cleanup Method - virtual void SAL_CALL onTerminated() SAL_OVERRIDE; + virtual void SAL_CALL onTerminated() override; // sorted-queue data salhelper::Timer* m_pHead; |