summaryrefslogtreecommitdiff
path: root/cppu
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2015-10-12 16:04:04 +0200
committerStephan Bergmann <sbergman@redhat.com>2015-10-12 17:52:29 +0200
commitb36963c0a6a09f70ca6d8d607dd3249a3496497d (patch)
tree33e06dc8d227957cb31355277fb5cf20b9918628 /cppu
parentb08247a12b43fcd9f86ecd912fce7d69a3e66061 (diff)
Replace "SAL_OVERRIDE" with "override" in LIBO_INTERNAL_ONLY code
Change-Id: I2ea407acd763ef2d7dae2d3b8f32525523ac8274
Diffstat (limited to 'cppu')
-rw-r--r--cppu/qa/test_any.cxx18
-rw-r--r--cppu/qa/test_reference.cxx6
-rw-r--r--cppu/source/AffineBridge/AffineBridge.cxx14
-rw-r--r--cppu/source/LogBridge/LogBridge.cxx10
-rw-r--r--cppu/source/UnsafeBridge/UnsafeBridge.cxx10
-rw-r--r--cppu/source/helper/purpenv/helper_purpenv_Environment.cxx10
-rw-r--r--cppu/source/threadpool/thread.hxx4
7 files changed, 36 insertions, 36 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;
diff --git a/cppu/source/AffineBridge/AffineBridge.cxx b/cppu/source/AffineBridge/AffineBridge.cxx
index b0f23d41162a..657a1630680f 100644
--- a/cppu/source/AffineBridge/AffineBridge.cxx
+++ b/cppu/source/AffineBridge/AffineBridge.cxx
@@ -71,13 +71,13 @@ public:
explicit AffineBridge();
virtual ~AffineBridge();
- virtual void v_callInto_v(uno_EnvCallee * pCallee, va_list * pParam) SAL_OVERRIDE;
- virtual void v_callOut_v (uno_EnvCallee * pCallee, va_list * pParam) SAL_OVERRIDE;
+ virtual void v_callInto_v(uno_EnvCallee * pCallee, va_list * pParam) override;
+ virtual void v_callOut_v (uno_EnvCallee * pCallee, va_list * pParam) override;
- virtual void v_enter() SAL_OVERRIDE;
- virtual void v_leave() SAL_OVERRIDE;
+ virtual void v_enter() override;
+ virtual void v_leave() override;
- virtual bool v_isValid(rtl::OUString * pReason) SAL_OVERRIDE;
+ virtual bool v_isValid(rtl::OUString * pReason) override;
void innerDispatch();
void outerDispatch(int loop);
@@ -85,7 +85,7 @@ public:
class InnerThread : public osl::Thread
{
- virtual void SAL_CALL run() SAL_OVERRIDE;
+ virtual void SAL_CALL run() override;
AffineBridge * m_pAffineBridge;
@@ -108,7 +108,7 @@ void InnerThread::run()
class OuterThread : public osl::Thread
{
- virtual void SAL_CALL run() SAL_OVERRIDE;
+ virtual void SAL_CALL run() override;
AffineBridge * m_pAffineBridge;
diff --git a/cppu/source/LogBridge/LogBridge.cxx b/cppu/source/LogBridge/LogBridge.cxx
index ba1bd2be2d14..edbdad8460b4 100644
--- a/cppu/source/LogBridge/LogBridge.cxx
+++ b/cppu/source/LogBridge/LogBridge.cxx
@@ -45,13 +45,13 @@ class LogBridge : public cppu::Enterable
public:
explicit LogBridge();
- virtual void v_callInto_v(uno_EnvCallee * pCallee, va_list * pParam) SAL_OVERRIDE;
- virtual void v_callOut_v (uno_EnvCallee * pCallee, va_list * pParam) SAL_OVERRIDE;
+ virtual void v_callInto_v(uno_EnvCallee * pCallee, va_list * pParam) override;
+ virtual void v_callOut_v (uno_EnvCallee * pCallee, va_list * pParam) override;
- virtual void v_enter() SAL_OVERRIDE;
- virtual void v_leave() SAL_OVERRIDE;
+ virtual void v_enter() override;
+ virtual void v_leave() override;
- virtual bool v_isValid(rtl::OUString * pReason) SAL_OVERRIDE;
+ virtual bool v_isValid(rtl::OUString * pReason) override;
};
LogBridge::LogBridge()
diff --git a/cppu/source/UnsafeBridge/UnsafeBridge.cxx b/cppu/source/UnsafeBridge/UnsafeBridge.cxx
index a2e9887ddec6..85690841bccc 100644
--- a/cppu/source/UnsafeBridge/UnsafeBridge.cxx
+++ b/cppu/source/UnsafeBridge/UnsafeBridge.cxx
@@ -53,13 +53,13 @@ class UnsafeBridge : public cppu::Enterable
public:
explicit UnsafeBridge();
- virtual void v_callInto_v(uno_EnvCallee * pCallee, va_list * pParam) SAL_OVERRIDE;
- virtual void v_callOut_v (uno_EnvCallee * pCallee, va_list * pParam) SAL_OVERRIDE;
+ virtual void v_callInto_v(uno_EnvCallee * pCallee, va_list * pParam) override;
+ virtual void v_callOut_v (uno_EnvCallee * pCallee, va_list * pParam) override;
- virtual void v_enter() SAL_OVERRIDE;
- virtual void v_leave() SAL_OVERRIDE;
+ virtual void v_enter() override;
+ virtual void v_leave() override;
- virtual bool v_isValid(rtl::OUString * pReason) SAL_OVERRIDE;
+ virtual bool v_isValid(rtl::OUString * pReason) override;
};
UnsafeBridge::UnsafeBridge()
diff --git a/cppu/source/helper/purpenv/helper_purpenv_Environment.cxx b/cppu/source/helper/purpenv/helper_purpenv_Environment.cxx
index f6dc421b4db6..e20206fd27fe 100644
--- a/cppu/source/helper/purpenv/helper_purpenv_Environment.cxx
+++ b/cppu/source/helper/purpenv/helper_purpenv_Environment.cxx
@@ -100,11 +100,11 @@ public:
void acquireInterface (void * pInterface);
void releaseInterface (void * pInterface);
- virtual void v_enter() SAL_OVERRIDE;
- virtual void v_leave() SAL_OVERRIDE;
- virtual void v_callInto_v(uno_EnvCallee * pCallee, va_list * pParam) SAL_OVERRIDE;
- virtual void v_callOut_v (uno_EnvCallee * pCallee, va_list * pParam) SAL_OVERRIDE;
- virtual bool v_isValid (rtl::OUString * pReason) SAL_OVERRIDE;
+ virtual void v_enter() override;
+ virtual void v_leave() override;
+ virtual void v_callInto_v(uno_EnvCallee * pCallee, va_list * pParam) override;
+ virtual void v_callOut_v (uno_EnvCallee * pCallee, va_list * pParam) override;
+ virtual bool v_isValid (rtl::OUString * pReason) override;
protected:
oslInterlockedCount m_nRef;
diff --git a/cppu/source/threadpool/thread.hxx b/cppu/source/threadpool/thread.hxx
index 2b7aa966488c..fa67a082bd94 100644
--- a/cppu/source/threadpool/thread.hxx
+++ b/cppu/source/threadpool/thread.hxx
@@ -54,8 +54,8 @@ namespace cppu_threadpool {
{ SimpleReferenceObject::operator delete(pointer); }
private:
- virtual void SAL_CALL run() SAL_OVERRIDE;
- virtual void SAL_CALL onTerminated() SAL_OVERRIDE;
+ virtual void SAL_CALL run() override;
+ virtual void SAL_CALL onTerminated() override;
ThreadPoolHolder m_aThreadPool;
JobQueue *m_pQueue;