summaryrefslogtreecommitdiff
path: root/cppu
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2014-03-26 16:37:00 +0100
committerStephan Bergmann <sbergman@redhat.com>2014-03-26 16:39:26 +0100
commit70cc2b191b95fbc210bc1f0f6a7159f341894f0f (patch)
treea70f4957c454b443520cbf91250c41d9eea80017 /cppu
parent8757bea2e88c6e349e1fe98d8e9695d7b9c6179e (diff)
First batch of adding SAL_OVERRRIDE to overriding function declarations
...mostly done with a rewriting Clang plugin, with just some manual tweaking necessary to fix poor macro usage. Change-Id: I71fa20213e86be10de332ece0aa273239df7b61a
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 b1cdd53a16d4..e022f8286266 100644
--- a/cppu/qa/test_any.cxx
+++ b/cppu/qa/test_any.cxx
@@ -88,7 +88,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)
+ throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
{
if (type
== getCppuType< css::uno::Reference< css::uno::XInterface > >())
@@ -104,11 +104,11 @@ public:
}
}
- virtual void SAL_CALL acquire() throw () {
+ virtual void SAL_CALL acquire() throw () SAL_OVERRIDE {
Base::acquire();
}
- virtual void SAL_CALL release() throw () {
+ virtual void SAL_CALL release() throw () SAL_OVERRIDE {
Base::release();
}
};
@@ -116,7 +116,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)
+ throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
{
if (type
== getCppuType< css::uno::Reference< css::uno::XInterface > >())
@@ -140,11 +140,11 @@ public:
}
}
- virtual void SAL_CALL acquire() throw () {
+ virtual void SAL_CALL acquire() throw () SAL_OVERRIDE {
Base::acquire();
}
- virtual void SAL_CALL release() throw () {
+ virtual void SAL_CALL release() throw () SAL_OVERRIDE {
Base::release();
}
};
@@ -152,7 +152,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)
+ throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
{
if (type
== getCppuType< css::uno::Reference< css::uno::XInterface > >())
@@ -177,11 +177,11 @@ public:
}
}
- virtual void SAL_CALL acquire() throw () {
+ virtual void SAL_CALL acquire() throw () SAL_OVERRIDE {
Base::acquire();
}
- virtual void SAL_CALL release() throw () {
+ virtual void SAL_CALL release() throw () SAL_OVERRIDE {
Base::release();
}
};
diff --git a/cppu/qa/test_reference.cxx b/cppu/qa/test_reference.cxx
index e49c31620124..f9058260484f 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)
+ throw (RuntimeException, std::exception) SAL_OVERRIDE
{
Any aInterface;
if (_type == getCppuType< Reference< XInterface > >())
@@ -65,12 +65,12 @@ public:
return Any();
}
- virtual void SAL_CALL acquire() throw ()
+ virtual void SAL_CALL acquire() throw () SAL_OVERRIDE
{
osl_atomic_increment( &m_refCount );
}
- virtual void SAL_CALL release() throw ()
+ virtual void SAL_CALL release() throw () SAL_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 72d0f88cb3ad..786e9d9ede2a 100644
--- a/cppu/source/AffineBridge/AffineBridge.cxx
+++ b/cppu/source/AffineBridge/AffineBridge.cxx
@@ -69,13 +69,13 @@ public:
explicit AffineBridge(void);
virtual ~AffineBridge(void);
- virtual void v_callInto_v(uno_EnvCallee * pCallee, va_list * pParam);
- virtual void v_callOut_v (uno_EnvCallee * pCallee, va_list * pParam);
+ 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_enter(void);
- virtual void v_leave(void);
+ virtual void v_enter(void) SAL_OVERRIDE;
+ virtual void v_leave(void) SAL_OVERRIDE;
- virtual bool v_isValid(rtl::OUString * pReason);
+ virtual bool v_isValid(rtl::OUString * pReason) SAL_OVERRIDE;
void innerDispatch(void);
void outerDispatch(int loop);
@@ -83,7 +83,7 @@ public:
class InnerThread : public osl::Thread
{
- virtual void SAL_CALL run(void);
+ virtual void SAL_CALL run(void) SAL_OVERRIDE;
AffineBridge * m_pAffineBridge;
@@ -104,7 +104,7 @@ void InnerThread::run(void)
class OuterThread : public osl::Thread
{
- virtual void SAL_CALL run(void);
+ virtual void SAL_CALL run(void) SAL_OVERRIDE;
AffineBridge * m_pAffineBridge;
diff --git a/cppu/source/LogBridge/LogBridge.cxx b/cppu/source/LogBridge/LogBridge.cxx
index 5373a7727ebd..926146b9497d 100644
--- a/cppu/source/LogBridge/LogBridge.cxx
+++ b/cppu/source/LogBridge/LogBridge.cxx
@@ -42,13 +42,13 @@ class LogBridge : public cppu::Enterable
public:
explicit LogBridge(void);
- virtual void v_callInto_v(uno_EnvCallee * pCallee, va_list * pParam);
- virtual void v_callOut_v (uno_EnvCallee * pCallee, va_list * pParam);
+ 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_enter(void);
- virtual void v_leave(void);
+ virtual void v_enter(void) SAL_OVERRIDE;
+ virtual void v_leave(void) SAL_OVERRIDE;
- virtual bool v_isValid(rtl::OUString * pReason);
+ virtual bool v_isValid(rtl::OUString * pReason) SAL_OVERRIDE;
};
LogBridge::LogBridge(void)
diff --git a/cppu/source/UnsafeBridge/UnsafeBridge.cxx b/cppu/source/UnsafeBridge/UnsafeBridge.cxx
index dcb3fe7f76ad..27cea46275b1 100644
--- a/cppu/source/UnsafeBridge/UnsafeBridge.cxx
+++ b/cppu/source/UnsafeBridge/UnsafeBridge.cxx
@@ -51,13 +51,13 @@ class UnsafeBridge : public cppu::Enterable
public:
explicit UnsafeBridge(void);
- virtual void v_callInto_v(uno_EnvCallee * pCallee, va_list * pParam);
- virtual void v_callOut_v (uno_EnvCallee * pCallee, va_list * pParam);
+ 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_enter(void);
- virtual void v_leave(void);
+ virtual void v_enter(void) SAL_OVERRIDE;
+ virtual void v_leave(void) SAL_OVERRIDE;
- virtual bool v_isValid(rtl::OUString * pReason);
+ virtual bool v_isValid(rtl::OUString * pReason) SAL_OVERRIDE;
};
UnsafeBridge::UnsafeBridge(void)
diff --git a/cppu/source/helper/purpenv/helper_purpenv_Environment.cxx b/cppu/source/helper/purpenv/helper_purpenv_Environment.cxx
index 48d5dabe899b..ba70199dadbe 100644
--- a/cppu/source/helper/purpenv/helper_purpenv_Environment.cxx
+++ b/cppu/source/helper/purpenv/helper_purpenv_Environment.cxx
@@ -99,11 +99,11 @@ public:
void acquireInterface (void * pInterface);
void releaseInterface (void * pInterface);
- virtual void v_enter (void);
- virtual void v_leave (void);
- virtual void v_callInto_v(uno_EnvCallee * pCallee, va_list * pParam);
- virtual void v_callOut_v (uno_EnvCallee * pCallee, va_list * pParam);
- virtual bool v_isValid (rtl::OUString * pReason);
+ virtual void v_enter (void) SAL_OVERRIDE;
+ virtual void v_leave (void) 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;
protected:
oslInterlockedCount m_nRef;
diff --git a/cppu/source/threadpool/thread.hxx b/cppu/source/threadpool/thread.hxx
index 64641816df01..45355004ed80 100644
--- a/cppu/source/threadpool/thread.hxx
+++ b/cppu/source/threadpool/thread.hxx
@@ -55,8 +55,8 @@ namespace cppu_threadpool {
{ SimpleReferenceObject::operator delete(pointer); }
private:
- virtual void SAL_CALL run();
- virtual void SAL_CALL onTerminated();
+ virtual void SAL_CALL run() SAL_OVERRIDE;
+ virtual void SAL_CALL onTerminated() SAL_OVERRIDE;
ThreadPoolHolder m_aThreadPool;
JobQueue *m_pQueue;