diff options
| author | Norbert Thiebaud <nthiebaud@gmail.com> | 2010-10-16 03:15:49 -0500 |
|---|---|---|
| committer | Norbert Thiebaud <nthiebaud@gmail.com> | 2010-10-25 19:55:29 -0500 |
| commit | 46308b84ddc46d8f99e6b3416636e6286d23d7e3 (patch) | |
| tree | 97d55ea961f775677ed95cb94be5aadbc9bcc680 /automation/source/simplecm/tcpio.cxx | |
| parent | d3d553e1ef00b1ae5ac4d65e53e8ea08b24085f3 (diff) | |
merge vosremoval-mutex.diff
In practice the changeset is 'inspired' by vosremoval-mutex.diff
but was essentially redone manually
Diffstat (limited to 'automation/source/simplecm/tcpio.cxx')
| -rw-r--r-- | automation/source/simplecm/tcpio.cxx | 8 |
1 files changed, 4 insertions, 4 deletions
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; } |