From 46308b84ddc46d8f99e6b3416636e6286d23d7e3 Mon Sep 17 00:00:00 2001
From: Norbert Thiebaud <nthiebaud@gmail.com>
Date: Sat, 16 Oct 2010 03:15:49 -0500
Subject: merge vosremoval-mutex.diff
In practice the changeset is 'inspired' by vosremoval-mutex.diff
but was essentially redone manually
---
automation/source/simplecm/tcpio.cxx | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
(limited to 'automation/source/simplecm/tcpio.cxx')
diff --git a/automation/source/simplecm/tcpio.cxx b/automation/source/simplecm/tcpio.cxx
index 2906c04d2de0..e71afb399b84 100644
--- a/automation/source/simplecm/tcpio.cxx
+++ b/automation/source/simplecm/tcpio.cxx
@@ -34,7 +34,7 @@
/// implement ITransmiter
comm_USHORT TCPIO::TransferBytes( const void* pBuffer, comm_UINT32 nLen )
{
- vos::OGuard aGuard( aMSocketWriteAccess );
+ osl::MutexGuard aGuard( aMSocketWriteAccess );
if ( !pStreamSocket )
{
nLastSent = 0;
@@ -50,7 +50,7 @@ comm_USHORT TCPIO::TransferBytes( const void* pBuffer, comm_UINT32 nLen )
/// implement IReceiver
comm_USHORT TCPIO::ReceiveBytes( void* pBuffer, comm_UINT32 nLen )
{
- vos::OGuard aGuard( aMSocketReadAccess );
+ osl::MutexGuard aGuard( aMSocketReadAccess );
if ( !pStreamSocket )
{
nLastReceived = 0;
@@ -66,8 +66,8 @@ comm_USHORT TCPIO::ReceiveBytes( void* pBuffer, comm_UINT32 nLen )
// helper
void TCPIO::SetStreamSocket( osl::StreamSocket* pSocket )
{
- vos::OGuard aRGuard( aMSocketReadAccess );
- vos::OGuard aWGuard( aMSocketWriteAccess );
+ osl::MutexGuard aRGuard( aMSocketReadAccess );
+ osl::MutexGuard aWGuard( aMSocketWriteAccess );
pStreamSocket = pSocket;
}
--
cgit