From 6cb9e6dad798ec59f055aebe84a9c4a21e4be40d Mon Sep 17 00:00:00 2001 From: Stephan Bergmann Date: Fri, 3 Mar 2017 20:57:02 +0100 Subject: Remove redundant 'inline' keyword ...from function definitions occurring within class definitions. Done with a rewriting Clang plugin (to be pushed later). Change-Id: I9c6f2818a57ccdb361548895a7743107cbacdff8 Reviewed-on: https://gerrit.libreoffice.org/34874 Tested-by: Jenkins Reviewed-by: Stephan Bergmann --- include/cppu/Enterable.hxx | 10 +++++----- include/cppu/unotype.hxx | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) (limited to 'include/cppu') diff --git a/include/cppu/Enterable.hxx b/include/cppu/Enterable.hxx index 4670ab52d49e..9e6970d8e4e0 100644 --- a/include/cppu/Enterable.hxx +++ b/include/cppu/Enterable.hxx @@ -47,16 +47,16 @@ public: public: inline explicit Enterable(); - inline void enter() {m_enter(this);} - inline void leave() {m_leave(this);} + void enter() {m_enter(this);} + void leave() {m_leave(this);} - inline void callInto_v(uno_EnvCallee * pCallee, va_list * pParam) {m_callInto_v(this, pCallee, pParam);} - inline void callOut_v (uno_EnvCallee * pCallee, va_list * pParam) {m_callOut_v (this, pCallee, pParam);} + void callInto_v(uno_EnvCallee * pCallee, va_list * pParam) {m_callInto_v(this, pCallee, pParam);} + void callOut_v (uno_EnvCallee * pCallee, va_list * pParam) {m_callOut_v (this, pCallee, pParam);} inline void callInto(uno_EnvCallee * pCallee, ...); inline void callOut (uno_EnvCallee * pCallee, ...); - inline int isValid (rtl::OUString * pReason) {return m_isValid(this, &pReason->pData);} + int isValid (rtl::OUString * pReason) {return m_isValid(this, &pReason->pData);} private: Enterable(Enterable const &) SAL_DELETED_FUNCTION; diff --git a/include/cppu/unotype.hxx b/include/cppu/unotype.hxx index a9bcc2726062..40708129ae6f 100644 --- a/include/cppu/unotype.hxx +++ b/include/cppu/unotype.hxx @@ -285,7 +285,7 @@ namespace cppu { */ template< typename T > class UnoType { public: - static inline css::uno::Type const & get() { + static css::uno::Type const & get() { using namespace ::cppu::detail; #if defined LIBO_INTERNAL_ONLY typedef typename std::remove_reference::type T1; -- cgit