summaryrefslogtreecommitdiff
path: root/sd/source/ui/remotecontrol/Server.cxx
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2015-09-17 18:59:32 +0100
committerCaolán McNamara <caolanm@redhat.com>2015-09-17 18:59:32 +0100
commitd030c4a2a54418b17e87f837092a33eae21f0588 (patch)
treedd80ff3ba78eaa03e98efeb87e9160c6cd7524c5 /sd/source/ui/remotecontrol/Server.cxx
parent558b08d55f69b04eea42a37abd97fbb4dbe3602f (diff)
revert for mac and win unit case crashes after boost->std
Change-Id: I82c7084f203a834c2d42f9527705288e6036019b
Diffstat (limited to 'sd/source/ui/remotecontrol/Server.cxx')
-rw-r--r--sd/source/ui/remotecontrol/Server.cxx14
1 files changed, 7 insertions, 7 deletions
diff --git a/sd/source/ui/remotecontrol/Server.cxx b/sd/source/ui/remotecontrol/Server.cxx
index ad9dcc345df2..0b7f37a62f23 100644
--- a/sd/source/ui/remotecontrol/Server.cxx
+++ b/sd/source/ui/remotecontrol/Server.cxx
@@ -129,7 +129,7 @@ void RemoteServer::execute()
OUString aAddress = aClientAddr.getHostname();
MutexGuard aGuard( sDataMutex );
- std::shared_ptr< ClientInfoInternal > pClient(
+ ::boost::shared_ptr< ClientInfoInternal > pClient(
new ClientInfoInternal(
OStringToOUString( aName, RTL_TEXTENCODING_UTF8 ),
aAddress, false, pSocket, OStringToOUString( aPin,
@@ -239,10 +239,10 @@ void RemoteServer::removeCommunicator( Communicator* mCommunicator )
}
}
-std::vector< std::shared_ptr< ClientInfo > > RemoteServer::getClients()
+std::vector< ::boost::shared_ptr< ClientInfo > > RemoteServer::getClients()
{
SAL_INFO( "sdremote", "RemoteServer::getClients() called" );
- std::vector< std::shared_ptr< ClientInfo > > aClients;
+ std::vector< ::boost::shared_ptr< ClientInfo > > aClients;
if ( spServer )
{
MutexGuard aGuard( sDataMutex );
@@ -266,13 +266,13 @@ std::vector< std::shared_ptr< ClientInfo > > RemoteServer::getClients()
Sequence< OUString > aNames = xConfig->getElementNames();
for ( int i = 0; i < aNames.getLength(); i++ )
{
- aClients.push_back( std::shared_ptr< ClientInfo > ( new ClientInfo( aNames[i], "", true ) ) );
+ aClients.push_back( ::boost::shared_ptr< ClientInfo > ( new ClientInfo( aNames[i], "", true ) ) );
}
return aClients;
}
-bool RemoteServer::connectClient( std::shared_ptr< ClientInfo > pClient, const OUString& aPin )
+bool RemoteServer::connectClient( ::boost::shared_ptr< ClientInfo > pClient, const OUString& aPin )
{
SAL_INFO( "sdremote", "RemoteServer::connectClient called" );
if ( !spServer )
@@ -321,7 +321,7 @@ bool RemoteServer::connectClient( std::shared_ptr< ClientInfo > pClient, const O
sCommunicators.push_back( pCommunicator );
- for ( vector< std::shared_ptr< ClientInfoInternal > >::iterator aIt = spServer->mAvailableClients.begin();
+ for ( vector< ::boost::shared_ptr< ClientInfoInternal > >::iterator aIt = spServer->mAvailableClients.begin();
aIt != spServer->mAvailableClients.end(); ++aIt )
{
if ( pClient == *aIt )
@@ -339,7 +339,7 @@ bool RemoteServer::connectClient( std::shared_ptr< ClientInfo > pClient, const O
}
}
-void RemoteServer::deauthoriseClient( std::shared_ptr< ClientInfo > pClient )
+void RemoteServer::deauthoriseClient( ::boost::shared_ptr< ClientInfo > pClient )
{
// TODO: we probably want to forcefully disconnect at this point too?
// But possibly via a separate function to allow just disconnecting from