diff options
Diffstat (limited to 'cppu/source')
| -rw-r--r-- | cppu/source/AffineBridge/AffineBridge.cxx | 14 | ||||
| -rw-r--r-- | cppu/source/LogBridge/LogBridge.cxx | 10 | ||||
| -rw-r--r-- | cppu/source/UnsafeBridge/UnsafeBridge.cxx | 10 | ||||
| -rw-r--r-- | cppu/source/helper/purpenv/helper_purpenv_Environment.cxx | 10 | ||||
| -rw-r--r-- | cppu/source/threadpool/thread.hxx | 4 |
5 files changed, 24 insertions, 24 deletions
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; |