diff options
author | Sander Vesik <svesik@openoffice.org> | 2004-04-21 12:39:58 +0000 |
---|---|---|
committer | Sander Vesik <svesik@openoffice.org> | 2004-04-21 12:39:58 +0000 |
commit | c6beef8c4450fdec91862591cf513625cf44b5c0 (patch) | |
tree | e611fd28c1b6f2c7094a41933201588a0eb6d1ec /bridges | |
parent | e6d27f94e9fab0709620c93f5e1d0cd9f63080d7 (diff) |
INTEGRATION: CWS ooo20040329 (1.1.1.1.164); FILE MERGED
2004/03/17 10:15:03 waratah 1.1.1.1.164.1: #i1858# alter the order of some definitions to fix some -Wall warnings
Diffstat (limited to 'bridges')
-rw-r--r-- | bridges/inc/bridges/remote/bridgeimpl.hxx | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/bridges/inc/bridges/remote/bridgeimpl.hxx b/bridges/inc/bridges/remote/bridgeimpl.hxx index d4710604a..22e631f12 100644 --- a/bridges/inc/bridges/remote/bridgeimpl.hxx +++ b/bridges/inc/bridges/remote/bridgeimpl.hxx @@ -2,9 +2,9 @@ * * $RCSfile: bridgeimpl.hxx,v $ * - * $Revision: 1.1.1.1 $ + * $Revision: 1.2 $ * - * last change: $Author: hr $ $Date: 2000-09-18 15:28:47 $ + * last change: $Author: svesik $ $Date: 2004-04-21 13:39:58 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -60,7 +60,6 @@ ************************************************************************/ #ifndef _BRIDGES_REMOTE_BRIDGEIMPL_HXX_ #define _BRIDGES_REMOTE_BRIDGEIMPL_HXX_ - #include <osl/interlck.h> #include <uno/environment.h> @@ -91,16 +90,16 @@ namespace bridges_remote { // performance optimization. In some cases, it is not necessary to acquire the // environment. RemoteThreadCounter( uno_Environment *pEnvRemote, RemoteThreadCounter_HoldEnvWeak value ) - : m_pEnvRemote( pEnvRemote ) - , m_bReleaseEnvironment( sal_False ) + : m_bReleaseEnvironment( sal_False ) + , m_pEnvRemote( pEnvRemote ) { remote_Context *pContext = ((remote_Context *) m_pEnvRemote->pContext ); osl_incrementInterlockedCount( &( pContext->m_pBridgeImpl->m_nRemoteThreads ) ); } RemoteThreadCounter( uno_Environment *pEnvRemote ) - : m_pEnvRemote( pEnvRemote ) - , m_bReleaseEnvironment( sal_True ) + : m_bReleaseEnvironment( sal_True ) + , m_pEnvRemote( pEnvRemote ) { m_pEnvRemote->acquire( m_pEnvRemote ); |