[Libreoffice-commits] core.git: framework/inc

Stephan Bergmann sbergman at redhat.com
Wed Mar 26 09:46:37 PDT 2014


 framework/inc/threadhelp/gate.hxx |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

New commits:
commit 190085dd4d1bc8cdfa5573158c8986b757ac1faf
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Wed Mar 26 17:45:14 2014 +0100

    Work around MSC "'override' cannot be used with 'inline'" bug
    
    Change-Id: I35170712b8f0c83ab35cb5ef7115a6dc434a7a4f

diff --git a/framework/inc/threadhelp/gate.hxx b/framework/inc/threadhelp/gate.hxx
index a8b87a8..b4e9ab0 100644
--- a/framework/inc/threadhelp/gate.hxx
+++ b/framework/inc/threadhelp/gate.hxx
@@ -98,7 +98,7 @@ class Gate : public  IGate
 
             @onerror    -
         *//*-*****************************************************************************************************/
-        inline virtual void open() SAL_OVERRIDE
+        virtual void open() SAL_OVERRIDE
         {
             // We must safe access to our internal member!
             ::osl::MutexGuard aLock( m_aAccessLock );
@@ -121,7 +121,7 @@ class Gate : public  IGate
 
             @onerror    -
         *//*-*****************************************************************************************************/
-        inline virtual void close() SAL_OVERRIDE
+        virtual void close() SAL_OVERRIDE
         {
             // We must safe access to our internal member!
             ::osl::MutexGuard aLock( m_aAccessLock );
@@ -147,7 +147,7 @@ class Gate : public  IGate
 
             @onerror    -
         *//*-*****************************************************************************************************/
-        inline virtual void openGap() SAL_OVERRIDE
+        virtual void openGap() SAL_OVERRIDE
         {
             // We must safe access to our internal member!
             ::osl::MutexGuard aLock( m_aAccessLock );
@@ -174,7 +174,7 @@ class Gate : public  IGate
 
             @onerror    We return false.
         *//*-*****************************************************************************************************/
-        inline virtual sal_Bool wait( const TimeValue* pTimeOut = NULL ) SAL_OVERRIDE
+        virtual sal_Bool wait( const TimeValue* pTimeOut = NULL ) SAL_OVERRIDE
         {
             // We must safe access to our internal member!
             ::osl::ClearableMutexGuard aLock( m_aAccessLock );


More information about the Libreoffice-commits mailing list