Author: hdu
Date: Mon Jan 21 14:32:21 2013
New Revision: 1436370
URL: http://svn.apache.org/viewvc?rev=1436370&view=rev
Log:
standalone semicolon is deprecated as toplevel declaration
Modified:
openoffice/trunk/main/cppu/inc/cppu/Enterable.hxx
openoffice/trunk/main/sal/inc/osl/file.hxx
Modified: openoffice/trunk/main/cppu/inc/cppu/Enterable.hxx
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/cppu/inc/cppu/Enterable.hxx?rev=1436370&r1=1436369&r2=1436370&view=diff
==============================================================================
--- openoffice/trunk/main/cppu/inc/cppu/Enterable.hxx (original)
+++ openoffice/trunk/main/cppu/inc/cppu/Enterable.hxx Mon Jan 21 14:32:21 2013
@@ -46,16 +46,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, ...);
@@ -67,12 +67,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);}
Modified: openoffice/trunk/main/sal/inc/osl/file.hxx
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/sal/inc/osl/file.hxx?rev=1436370&r1=1436369&r2=1436370&view=diff
==============================================================================
--- openoffice/trunk/main/sal/inc/osl/file.hxx (original)
+++ openoffice/trunk/main/sal/inc/osl/file.hxx Mon Jan 21 14:32:21 2013
@@ -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.
