diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2015-09-17 11:30:13 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2015-09-17 14:12:07 +0100 |
| commit | ddc280920282ff3e2801e9a79f9dfa8a6c6f5699 (patch) | |
| tree | 4b477c76374f2f36659ba674c2e5d6796629d45b /sw/source/core/docnode | |
| parent | 63e7b7afa75252298606c84e8ec82adaee5fa28a (diff) | |
boost->std
Change-Id: Idfbcfa1e5ba7bff92e98693c33c4b33a6beda08f
Diffstat (limited to 'sw/source/core/docnode')
| -rw-r--r-- | sw/source/core/docnode/observablethread.cxx | 6 | ||||
| -rw-r--r-- | sw/source/core/docnode/retrievedinputstreamdata.cxx | 4 | ||||
| -rw-r--r-- | sw/source/core/docnode/threadmanager.cxx | 2 |
3 files changed, 6 insertions, 6 deletions
diff --git a/sw/source/core/docnode/observablethread.cxx b/sw/source/core/docnode/observablethread.cxx index b509f67460be..dbc72dfd3d5e 100644 --- a/sw/source/core/docnode/observablethread.cxx +++ b/sw/source/core/docnode/observablethread.cxx @@ -18,7 +18,7 @@ */ #include <observablethread.hxx> -#include <boost/shared_ptr.hpp> +#include <memory> /* class for an observable thread @@ -34,7 +34,7 @@ ObservableThread::~ObservableThread() { } -void ObservableThread::SetListener( boost::weak_ptr< IFinishedThreadListener > pThreadListener, +void ObservableThread::SetListener( std::weak_ptr< IFinishedThreadListener > pThreadListener, const oslInterlockedCount nThreadID ) { mpThreadListener = pThreadListener; @@ -51,7 +51,7 @@ void SAL_CALL ObservableThread::run() void SAL_CALL ObservableThread::onTerminated() { // notify observer - boost::shared_ptr< IFinishedThreadListener > pThreadListener = mpThreadListener.lock(); + std::shared_ptr< IFinishedThreadListener > pThreadListener = mpThreadListener.lock(); if ( pThreadListener ) { pThreadListener->NotifyAboutFinishedThread( mnThreadID ); diff --git a/sw/source/core/docnode/retrievedinputstreamdata.cxx b/sw/source/core/docnode/retrievedinputstreamdata.cxx index 1bbba464d1f9..4631ef8866a1 100644 --- a/sw/source/core/docnode/retrievedinputstreamdata.cxx +++ b/sw/source/core/docnode/retrievedinputstreamdata.cxx @@ -39,7 +39,7 @@ SwRetrievedInputStreamDataManager& SwRetrievedInputStreamDataManager::GetManager } SwRetrievedInputStreamDataManager::tDataKey SwRetrievedInputStreamDataManager::ReserveData( - boost::weak_ptr< SwAsyncRetrieveInputStreamThreadConsumer > pThreadConsumer ) + std::weak_ptr< SwAsyncRetrieveInputStreamThreadConsumer > pThreadConsumer ) { osl::MutexGuard aGuard(maMutex); @@ -139,7 +139,7 @@ IMPL_LINK_TYPED( SwRetrievedInputStreamDataManager, SwRetrievedInputStreamDataManager::tData aInputStreamData; if ( rDataManager.PopData( *pDataKey, aInputStreamData ) ) { - boost::shared_ptr< SwAsyncRetrieveInputStreamThreadConsumer > pThreadConsumer = + std::shared_ptr< SwAsyncRetrieveInputStreamThreadConsumer > pThreadConsumer = aInputStreamData.mpThreadConsumer.lock(); if ( pThreadConsumer ) { diff --git a/sw/source/core/docnode/threadmanager.cxx b/sw/source/core/docnode/threadmanager.cxx index daa12c3cbeb8..786dd763b9f3 100644 --- a/sw/source/core/docnode/threadmanager.cxx +++ b/sw/source/core/docnode/threadmanager.cxx @@ -56,7 +56,7 @@ ThreadManager::~ThreadManager() maStartedThreads.clear(); } -boost::weak_ptr< IFinishedThreadListener > ThreadManager::GetThreadListenerWeakRef() +std::weak_ptr< IFinishedThreadListener > ThreadManager::GetThreadListenerWeakRef() { return mpThreadListener; } |