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 /sal/cppunittester | |
| 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 'sal/cppunittester')
| -rw-r--r-- | sal/cppunittester/cppunittester.cxx | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/sal/cppunittester/cppunittester.cxx b/sal/cppunittester/cppunittester.cxx index f505b6d34e02..95eecbe6baf2 100644 --- a/sal/cppunittester/cppunittester.cxx +++ b/sal/cppunittester/cppunittester.cxx @@ -89,12 +89,12 @@ class TimingListener , private boost::noncopyable { public: - void startTest( CppUnit::Test *) SAL_OVERRIDE + void startTest( CppUnit::Test *) override { m_nStartTime = osl_getGlobalTimer(); } - void endTest( CppUnit::Test *test ) SAL_OVERRIDE + void endTest( CppUnit::Test *test ) override { sal_uInt32 nEndTime = osl_getGlobalTimer(); std::cout << test->getName() << ": " << nEndTime-m_nStartTime @@ -115,7 +115,7 @@ class EyecatcherListener , private boost::noncopyable { public: - void startTest( CppUnit::Test* test) SAL_OVERRIDE + void startTest( CppUnit::Test* test) override { std::unique_ptr<char[]> tn(new char [ test->getName().length() + 2 ]); strcpy(tn.get(), test->getName().c_str()); @@ -132,7 +132,7 @@ public: setenv("LO_TESTNAME", tn.get(), true); } - void endTest( CppUnit::Test* /* test */ ) SAL_OVERRIDE + void endTest( CppUnit::Test* /* test */ ) override { } }; @@ -141,7 +141,7 @@ public: class LogFailuresAsTheyHappen : public CppUnit::TestListener { public: - virtual void addFailure( const CppUnit::TestFailure &failure ) SAL_OVERRIDE + virtual void addFailure( const CppUnit::TestFailure &failure ) override { printFailureLocation( failure.sourceLine() ); printFailedTestName( failure ); @@ -291,7 +291,7 @@ public: return success; } - virtual bool operator()() const SAL_OVERRIDE + virtual bool operator()() const override { return run(); } |