summaryrefslogtreecommitdiffstats
path: root/cppu
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2017-03-03 20:57:02 +0100
committerStephan Bergmann <sbergman@redhat.com>2017-03-03 20:55:50 +0000
commit6cb9e6dad798ec59f055aebe84a9c4a21e4be40d (patch)
tree21a7d6c0b165251ba8e0f36e73c851d41ac9dd04 /cppu
parenttdf#42982 improve error reporting in sc unoobj (diff)
downloadcore-6cb9e6dad798ec59f055aebe84a9c4a21e4be40d.tar.gz
core-6cb9e6dad798ec59f055aebe84a9c4a21e4be40d.zip
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 <ci@libreoffice.org> Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'cppu')
-rw-r--r--cppu/source/threadpool/thread.hxx4
-rw-r--r--cppu/source/uno/lbmap.cxx6
2 files changed, 5 insertions, 5 deletions
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); }
};