summaryrefslogtreecommitdiff
path: root/include/salhelper
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 /include/salhelper
parent7e8806cd728bf906e1a8f1d649bef7337f297b1c (diff)
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 'include/salhelper')
-rw-r--r--include/salhelper/refobj.hxx2
-rw-r--r--include/salhelper/simplereferenceobject.hxx6
-rw-r--r--include/salhelper/thread.hxx4
3 files changed, 6 insertions, 6 deletions
diff --git a/include/salhelper/refobj.hxx b/include/salhelper/refobj.hxx
index c1535334fb2c..bb2f31bcd78f 100644
--- a/include/salhelper/refobj.hxx
+++ b/include/salhelper/refobj.hxx
@@ -62,7 +62,7 @@ public:
public:
/** Construction.
*/
- inline ReferenceObject() : m_nReferenceCount(0)
+ ReferenceObject() : m_nReferenceCount(0)
{}
diff --git a/include/salhelper/simplereferenceobject.hxx b/include/salhelper/simplereferenceobject.hxx
index 46b00ac332c2..e21797ce91be 100644
--- a/include/salhelper/simplereferenceobject.hxx
+++ b/include/salhelper/simplereferenceobject.hxx
@@ -57,7 +57,7 @@ namespace salhelper {
class SALHELPER_DLLPUBLIC SimpleReferenceObject
{
public:
- inline SimpleReferenceObject(): m_nCount(0) {}
+ SimpleReferenceObject(): m_nCount(0) {}
/** @attention
The results are undefined if, for any individual instance of
@@ -65,10 +65,10 @@ public:
the total number of calls to release() by a platform dependent amount
(which, hopefully, is quite large).
*/
- inline void acquire()
+ void acquire()
{ osl_atomic_increment(&m_nCount); }
- inline void release()
+ void release()
{ if (osl_atomic_decrement(&m_nCount) == 0) delete this; }
/** see general class documentation
diff --git a/include/salhelper/thread.hxx b/include/salhelper/thread.hxx
index 7b61a2972204..9cf827f0edc9 100644
--- a/include/salhelper/thread.hxx
+++ b/include/salhelper/thread.hxx
@@ -62,10 +62,10 @@ public:
using osl::Thread::wait;
using osl::Thread::yield;
- 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); }
protected: