[Libreoffice-commits] .: 2 commits - cppu/inc sal/inc
David Tardon
dtardon at kemper.freedesktop.org
Thu Dec 23 03:14:56 PST 2010
cppu/inc/cppu/Enterable.hxx | 18 +++++++++---------
sal/inc/osl/file.hxx | 4 ++--
2 files changed, 11 insertions(+), 11 deletions(-)
New commits:
commit 0f949c0b530c74cfff999fa3c1b69403cdf0e6b8
Author: David Tardon <dtardon at redhat.com>
Date: Thu Dec 23 11:21:14 2010 +0100
suppress compiler warning
diff --git a/cppu/inc/cppu/Enterable.hxx b/cppu/inc/cppu/Enterable.hxx
index cf238ed..5364791 100644
--- a/cppu/inc/cppu/Enterable.hxx
+++ b/cppu/inc/cppu/Enterable.hxx
@@ -51,16 +51,16 @@ public:
virtual void v_callOut_v (uno_EnvCallee * pCallee, va_list * pParam) = 0;
virtual int v_isValid (rtl::OUString * pReason) = 0;
- virtual ~Enterable() {};
+ virtual ~Enterable() {}
public:
inline explicit Enterable(void);
- inline void enter(void) {m_enter(this);};
- inline void leave(void) {m_leave(this);};
+ inline void enter(void) {m_enter(this);}
+ inline void leave(void) {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);};
+ 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);}
inline void callInto(uno_EnvCallee * pCallee, ...);
inline void callOut (uno_EnvCallee * pCallee, ...);
@@ -72,12 +72,12 @@ private:
Enterable & operator = (Enterable const &);
};
-extern "C" inline void Enterable_call_enter (void * context) { ((Enterable *)context)->v_enter(); };
-extern "C" inline void Enterable_call_leave (void * context) { ((Enterable *)context)->v_leave(); };
+extern "C" inline void Enterable_call_enter (void * context) { ((Enterable *)context)->v_enter(); }
+extern "C" inline void Enterable_call_leave (void * context) { ((Enterable *)context)->v_leave(); }
extern "C" inline void Enterable_call_callInto_v(void * context, uno_EnvCallee * pCallee, va_list * pParam)
- { ((Enterable *)context)->v_callInto_v(pCallee, pParam); };
+ { ((Enterable *)context)->v_callInto_v(pCallee, pParam); }
extern "C" inline void Enterable_call_callOut_v (void * context, uno_EnvCallee * pCallee, va_list * pParam)
- { ((Enterable *)context)->v_callOut_v(pCallee, pParam); };
+ { ((Enterable *)context)->v_callOut_v(pCallee, pParam); }
extern "C" inline int Enterable_call_isValid (void * context, rtl_uString ** pReason)
{return ((Enterable *)context)->v_isValid((rtl::OUString *)pReason);}
commit da371e2fb97603dbf9067e637f8d3629b8489b50
Author: David Tardon <dtardon at redhat.com>
Date: Thu Dec 23 11:21:00 2010 +0100
suppress compiler warning
diff --git a/sal/inc/osl/file.hxx b/sal/inc/osl/file.hxx
index ea36200..d72dfc4 100644
--- a/sal/inc/osl/file.hxx
+++ b/sal/inc/osl/file.hxx
@@ -1595,7 +1595,7 @@ public:
class DirectoryCreationObserver
{
public:
- virtual ~DirectoryCreationObserver() {};
+ virtual ~DirectoryCreationObserver() {}
/** This method will be called when a new directory has been
created and needs to be overwritten by derived classes.
@@ -1693,7 +1693,7 @@ public:
@see close()
*/
- inline sal_Bool isOpen() { return _pData != NULL; };
+ inline sal_Bool isOpen() { return _pData != NULL; }
/** Close a directory.
More information about the Libreoffice-commits
mailing list