summaryrefslogtreecommitdiff
path: root/io/source/acceptor/acceptor.cxx
diff options
context:
space:
mode:
authorJens-Heiner Rechtien <hr@openoffice.org>2006-06-19 23:16:18 +0000
committerJens-Heiner Rechtien <hr@openoffice.org>2006-06-19 23:16:18 +0000
commitac0a856e138d3a80c82bbe428e95e165f1931b94 (patch)
treed414e0c415b155a2dfa47f9e592f1706b7ca1151 /io/source/acceptor/acceptor.cxx
parent5d3292e5cfcaf1af1fc9cc6f4ce4082f0f39d177 (diff)
INTEGRATION: CWS warnings01 (1.15.28); FILE MERGED
2005/09/22 20:27:01 sb 1.15.28.3: RESYNC: (1.15-1.16); FILE MERGED 2005/09/07 14:14:51 sb 1.15.28.2: #i53898# Made code warning-free. 2005/09/01 08:14:27 sb 1.15.28.1: #i53898# Made code warning-free.
Diffstat (limited to 'io/source/acceptor/acceptor.cxx')
-rw-r--r--io/source/acceptor/acceptor.cxx12
1 files changed, 6 insertions, 6 deletions
diff --git a/io/source/acceptor/acceptor.cxx b/io/source/acceptor/acceptor.cxx
index b46c1d44b3fa..670836c73442 100644
--- a/io/source/acceptor/acceptor.cxx
+++ b/io/source/acceptor/acceptor.cxx
@@ -4,9 +4,9 @@
*
* $RCSfile: acceptor.cxx,v $
*
- * $Revision: 1.16 $
+ * $Revision: 1.17 $
*
- * last change: $Author: rt $ $Date: 2005-09-07 18:27:56 $
+ * last change: $Author: hr $ $Date: 2006-06-20 00:16:18 $
*
* The Contents of this file are made available subject to
* the terms of GNU Lesser General Public License Version 2.1.
@@ -97,9 +97,9 @@ namespace io_acceptor
OAcceptor::OAcceptor( const Reference< XComponentContext > & xCtx )
: m_pPipe( 0 )
, m_pSocket( 0 )
+ , m_bInAccept( sal_False )
, _xSMgr( xCtx->getServiceManager() )
, _xCtx( xCtx )
- , m_bInAccept( sal_False )
{
g_moduleCount.modCnt.acquire( &g_moduleCount.modCnt );
}
@@ -183,7 +183,7 @@ namespace io_acceptor
catch( ... )
{
{
- MutexGuard guard( m_mutex );
+ MutexGuard g( m_mutex );
delete m_pPipe;
m_pPipe = 0;
}
@@ -220,7 +220,7 @@ namespace io_acceptor
catch( ... )
{
{
- MutexGuard guard( m_mutex );
+ MutexGuard g( m_mutex );
delete m_pSocket;
m_pSocket = 0;
}
@@ -366,7 +366,7 @@ sal_Bool SAL_CALL component_canUnload( TimeValue *pTime )
//==================================================================================================
void SAL_CALL component_getImplementationEnvironment(
- const sal_Char ** ppEnvTypeName, uno_Environment ** ppEnv )
+ const sal_Char ** ppEnvTypeName, uno_Environment ** )
{
*ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME;
}