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 --- cppu/source/threadpool/thread.hxx | 4 ++-- cppu/source/uno/lbmap.cxx | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) (limited to 'cppu') diff --git a/cppu/source/threadpool/thread.hxx b/cppu/source/threadpool/thread.hxx index 1e74f025159b..0bdf225d6520 100644 --- a/cppu/source/threadpool/thread.hxx +++ b/cppu/source/threadpool/thread.hxx @@ -47,10 +47,10 @@ namespace cppu_threadpool { bool launch(); - static inline void * operator new(std::size_t size) + static void * operator new(std::size_t size) { return SimpleReferenceObject::operator new(size); } - static inline void operator delete(void * pointer) + static void operator delete(void * pointer) { SimpleReferenceObject::operator delete(pointer); } private: diff --git a/cppu/source/uno/lbmap.cxx b/cppu/source/uno/lbmap.cxx index 7cfba7a48be4..476198a0f69f 100644 --- a/cppu/source/uno/lbmap.cxx +++ b/cppu/source/uno/lbmap.cxx @@ -66,7 +66,7 @@ public: { other._pMapping = nullptr; } inline ~Mapping(); inline Mapping & SAL_CALL operator = ( uno_Mapping * pMapping ); - inline Mapping & SAL_CALL operator = ( const Mapping & rMapping ) + Mapping & SAL_CALL operator = ( const Mapping & rMapping ) { return operator = ( rMapping._pMapping ); } Mapping & operator =(Mapping && other) { if (_pMapping != nullptr) { @@ -76,9 +76,9 @@ public: other._pMapping = nullptr; return *this; } - inline uno_Mapping * SAL_CALL get() const + uno_Mapping * SAL_CALL get() const { return _pMapping; } - inline bool SAL_CALL is() const + bool SAL_CALL is() const { return (_pMapping != nullptr); } }; -- cgit