summaryrefslogtreecommitdiff
path: root/bridges/inc
diff options
context:
space:
mode:
authorSander Vesik <svesik@openoffice.org>2004-04-21 12:39:58 +0000
committerSander Vesik <svesik@openoffice.org>2004-04-21 12:39:58 +0000
commitf578782b3234ae315d0968577f3c0cffb2d84808 (patch)
treed1dc9b94cb00017656d02b9939f99654fe72d3e1 /bridges/inc
parent004435723efd8c0c928745dae52ddc603166aa70 (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/inc')
-rw-r--r--bridges/inc/bridges/remote/bridgeimpl.hxx13
1 files changed, 6 insertions, 7 deletions
diff --git a/bridges/inc/bridges/remote/bridgeimpl.hxx b/bridges/inc/bridges/remote/bridgeimpl.hxx
index 15151185c74b..e3975e726f36 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 );