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 /cppu/qa | |
| parent | b08247a12b43fcd9f86ecd912fce7d69a3e66061 (diff) | |
Replace "SAL_OVERRIDE" with "override" in LIBO_INTERNAL_ONLY code
Change-Id: I2ea407acd763ef2d7dae2d3b8f32525523ac8274
Diffstat (limited to 'cppu/qa')
| -rw-r--r-- | cppu/qa/test_any.cxx | 18 | ||||
| -rw-r--r-- | cppu/qa/test_reference.cxx | 6 |
2 files changed, 12 insertions, 12 deletions
diff --git a/cppu/qa/test_any.cxx b/cppu/qa/test_any.cxx index 3a0352b3c59f..4fdd4a485edc 100644 --- a/cppu/qa/test_any.cxx +++ b/cppu/qa/test_any.cxx @@ -85,7 +85,7 @@ private: class Impl1: public Interface1, private Base { public: virtual css::uno::Any SAL_CALL queryInterface(css::uno::Type const & type) - throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE + throw (css::uno::RuntimeException, std::exception) override { if (type == cppu::UnoType<css::uno::XInterface>::get()) { css::uno::Reference< css::uno::XInterface > ref( @@ -99,11 +99,11 @@ public: } } - virtual void SAL_CALL acquire() throw () SAL_OVERRIDE { + virtual void SAL_CALL acquire() throw () override { Base::acquire(); } - virtual void SAL_CALL release() throw () SAL_OVERRIDE { + virtual void SAL_CALL release() throw () override { Base::release(); } }; @@ -111,7 +111,7 @@ public: class Impl2: public Interface2a, public Interface3, private Base { public: virtual css::uno::Any SAL_CALL queryInterface(css::uno::Type const & type) - throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE + throw (css::uno::RuntimeException, std::exception) override { if (type == cppu::UnoType<css::uno::XInterface>::get()) { css::uno::Reference< css::uno::XInterface > ref( @@ -132,11 +132,11 @@ public: } } - virtual void SAL_CALL acquire() throw () SAL_OVERRIDE { + virtual void SAL_CALL acquire() throw () override { Base::acquire(); } - virtual void SAL_CALL release() throw () SAL_OVERRIDE { + virtual void SAL_CALL release() throw () override { Base::release(); } }; @@ -144,7 +144,7 @@ public: class Impl2b: public Interface2b, private Base { public: virtual css::uno::Any SAL_CALL queryInterface(css::uno::Type const & type) - throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE + throw (css::uno::RuntimeException, std::exception) override { if (type == cppu::UnoType<css::uno::XInterface>::get()) { css::uno::Reference< css::uno::XInterface > ref( @@ -165,11 +165,11 @@ public: } } - virtual void SAL_CALL acquire() throw () SAL_OVERRIDE { + virtual void SAL_CALL acquire() throw () override { Base::acquire(); } - virtual void SAL_CALL release() throw () SAL_OVERRIDE { + virtual void SAL_CALL release() throw () override { Base::release(); } }; diff --git a/cppu/qa/test_reference.cxx b/cppu/qa/test_reference.cxx index 055e166749b3..018776614166 100644 --- a/cppu/qa/test_reference.cxx +++ b/cppu/qa/test_reference.cxx @@ -48,7 +48,7 @@ public: } virtual Any SAL_CALL queryInterface(const Type & _type) - throw (RuntimeException, std::exception) SAL_OVERRIDE + throw (RuntimeException, std::exception) override { Any aInterface; if (_type == cppu::UnoType<XInterface>::get()) @@ -65,12 +65,12 @@ public: return Any(); } - virtual void SAL_CALL acquire() throw () SAL_OVERRIDE + virtual void SAL_CALL acquire() throw () override { osl_atomic_increment( &m_refCount ); } - virtual void SAL_CALL release() throw () SAL_OVERRIDE + virtual void SAL_CALL release() throw () override { if ( 0 == osl_atomic_decrement( &m_refCount ) ) delete this; |