[Libreoffice-commits] core.git: ucb/source vcl/osx
Caolán McNamara
caolanm at redhat.com
Wed Sep 23 23:23:59 PDT 2015
ucb/source/ucp/ext/ucpext_datasupplier.cxx | 2 -
ucb/source/ucp/webdav-neon/webdavdatasupplier.cxx | 8 ++--
ucb/source/ucp/webdav/SerfSession.cxx | 40 +++++++++++-----------
ucb/source/ucp/webdav/SerfSession.hxx | 6 +--
vcl/osx/OSXTransferable.hxx | 2 -
5 files changed, 29 insertions(+), 29 deletions(-)
New commits:
commit c4fba6557cd7743d3f7ecc542f9cb2a36d0cd382
Author: Caolán McNamara <caolanm at redhat.com>
Date: Thu Sep 24 02:02:59 2015 +0100
boost->std
Change-Id: I24ecb1173af3711dfd6e8a9284f5d7a095d9c544
Reviewed-on: https://gerrit.libreoffice.org/18819
Tested-by: Jenkins <ci at libreoffice.org>
Reviewed-by: Caolán McNamara <caolanm at redhat.com>
Tested-by: Caolán McNamara <caolanm at redhat.com>
diff --git a/ucb/source/ucp/ext/ucpext_datasupplier.cxx b/ucb/source/ucp/ext/ucpext_datasupplier.cxx
index d439e60..7a249f8 100644
--- a/ucb/source/ucp/ext/ucpext_datasupplier.cxx
+++ b/ucb/source/ucp/ext/ucpext_datasupplier.cxx
@@ -32,8 +32,8 @@
#include <tools/diagnose_ex.h>
#include <rtl/ustrbuf.hxx>
+#include <memory>
#include <vector>
-#include <boost/shared_ptr.hpp>
namespace ucb { namespace ucp { namespace ext
diff --git a/ucb/source/ucp/webdav-neon/webdavdatasupplier.cxx b/ucb/source/ucp/webdav-neon/webdavdatasupplier.cxx
index 6df724c..16f3969 100644
--- a/ucb/source/ucp/webdav-neon/webdavdatasupplier.cxx
+++ b/ucb/source/ucp/webdav-neon/webdavdatasupplier.cxx
@@ -33,11 +33,11 @@
*************************************************************************/
#include <boost/ptr_container/ptr_vector.hpp>
-#include <boost/shared_ptr.hpp>
#include <osl/diagnose.h>
#include <com/sun/star/ucb/OpenMode.hpp>
#include <ucbhelper/contentidentifier.hxx>
#include <ucbhelper/providerhelper.hxx>
+#include <memory>
#include "webdavdatasupplier.hxx"
#include "webdavcontent.hxx"
#include "ContentProperties.hxx"
@@ -62,9 +62,9 @@ struct ResultListEntry
uno::Reference< ucb::XContentIdentifier > xId;
uno::Reference< ucb::XContent > xContent;
uno::Reference< sdbc::XRow > xRow;
- boost::shared_ptr<ContentProperties> const pData;
+ std::shared_ptr<ContentProperties> const pData;
- explicit ResultListEntry(boost::shared_ptr<ContentProperties> const& pEntry)
+ explicit ResultListEntry(std::shared_ptr<ContentProperties> const& pEntry)
: pData(pEntry)
{}
};
@@ -429,7 +429,7 @@ bool DataSupplier::getData()
}
}
- boost::shared_ptr<ContentProperties> const
+ std::shared_ptr<ContentProperties> const
pContentProperties(new ContentProperties(rRes));
// Check resource against open mode.
diff --git a/ucb/source/ucp/webdav/SerfSession.cxx b/ucb/source/ucp/webdav/SerfSession.cxx
index 9cb54ad..0535db4 100644
--- a/ucb/source/ucp/webdav/SerfSession.cxx
+++ b/ucb/source/ucp/webdav/SerfSession.cxx
@@ -605,7 +605,7 @@ void SerfSession::PROPFIND( const OUString & inPath,
Init( rEnv );
apr_status_t status = APR_SUCCESS;
- boost::shared_ptr<SerfRequestProcessor> aReqProc( createReqProc( inPath ) );
+ std::shared_ptr<SerfRequestProcessor> aReqProc( createReqProc( inPath ) );
aReqProc->processPropFind( inDepth,
inPropNames,
ioResources,
@@ -635,7 +635,7 @@ void SerfSession::PROPFIND( const OUString & inPath,
Init( rEnv );
apr_status_t status = APR_SUCCESS;
- boost::shared_ptr<SerfRequestProcessor> aReqProc( createReqProc( inPath ) );
+ std::shared_ptr<SerfRequestProcessor> aReqProc( createReqProc( inPath ) );
aReqProc->processPropFind( inDepth,
ioResInfo,
status );
@@ -663,7 +663,7 @@ void SerfSession::PROPPATCH( const OUString & inPath,
Init( rEnv );
apr_status_t status = APR_SUCCESS;
- boost::shared_ptr<SerfRequestProcessor> aReqProc( createReqProc( inPath ) );
+ std::shared_ptr<SerfRequestProcessor> aReqProc( createReqProc( inPath ) );
aReqProc->processPropPatch( inValues,
status );
@@ -685,7 +685,7 @@ void SerfSession::HEAD( const OUString & inPath,
m_bIsHeadRequestInProgress = true;
- boost::shared_ptr<SerfRequestProcessor> aReqProc( createReqProc( inPath ) );
+ std::shared_ptr<SerfRequestProcessor> aReqProc( createReqProc( inPath ) );
ioResource.uri = inPath;
ioResource.properties.clear();
apr_status_t status = APR_SUCCESS;
@@ -712,7 +712,7 @@ SerfSession::GET( const OUString & inPath,
uno::Reference< SerfInputStream > xInputStream( new SerfInputStream );
apr_status_t status = APR_SUCCESS;
- boost::shared_ptr<SerfRequestProcessor> aReqProc( createReqProc( inPath ) );
+ std::shared_ptr<SerfRequestProcessor> aReqProc( createReqProc( inPath ) );
aReqProc->processGet( xInputStream,
status );
@@ -734,7 +734,7 @@ void SerfSession::GET( const OUString & inPath,
Init( rEnv );
apr_status_t status = APR_SUCCESS;
- boost::shared_ptr<SerfRequestProcessor> aReqProc( createReqProc( inPath ) );
+ std::shared_ptr<SerfRequestProcessor> aReqProc( createReqProc( inPath ) );
aReqProc->processGet( ioOutputStream,
status );
@@ -755,7 +755,7 @@ SerfSession::GET( const OUString & inPath,
Init( rEnv );
- boost::shared_ptr<SerfRequestProcessor> aReqProc( createReqProc( inPath ) );
+ std::shared_ptr<SerfRequestProcessor> aReqProc( createReqProc( inPath ) );
uno::Reference< SerfInputStream > xInputStream( new SerfInputStream );
ioResource.uri = inPath;
ioResource.properties.clear();
@@ -785,7 +785,7 @@ void SerfSession::GET( const OUString & inPath,
Init( rEnv );
- boost::shared_ptr<SerfRequestProcessor> aReqProc( createReqProc( inPath ) );
+ std::shared_ptr<SerfRequestProcessor> aReqProc( createReqProc( inPath ) );
ioResource.uri = inPath;
ioResource.properties.clear();
apr_status_t status = APR_SUCCESS;
@@ -809,7 +809,7 @@ void SerfSession::PUT( const OUString & inPath,
Init( rEnv );
- boost::shared_ptr<SerfRequestProcessor> aReqProc( createReqProc( inPath ) );
+ std::shared_ptr<SerfRequestProcessor> aReqProc( createReqProc( inPath ) );
uno::Sequence< sal_Int8 > aDataToSend;
if ( !getDataFromInputStream( inInputStream, aDataToSend, false ) )
throw DAVException( DAVException::DAV_INVALID_ARG );
@@ -842,7 +842,7 @@ SerfSession::POST( const OUString & inPath,
Init( rEnv );
- boost::shared_ptr<SerfRequestProcessor> aReqProc( createReqProc( inPath ) );
+ std::shared_ptr<SerfRequestProcessor> aReqProc( createReqProc( inPath ) );
uno::Reference< SerfInputStream > xInputStream( new SerfInputStream );
apr_status_t status = APR_SUCCESS;
aReqProc->processPost( reinterpret_cast< const char * >( aDataToSend.getConstArray() ),
@@ -877,7 +877,7 @@ void SerfSession::POST( const OUString & inPath,
Init( rEnv );
- boost::shared_ptr<SerfRequestProcessor> aReqProc( createReqProc( inPath ) );
+ std::shared_ptr<SerfRequestProcessor> aReqProc( createReqProc( inPath ) );
apr_status_t status = APR_SUCCESS;
aReqProc->processPost( reinterpret_cast< const char * >( aDataToSend.getConstArray() ),
aDataToSend.getLength(),
@@ -900,7 +900,7 @@ void SerfSession::MKCOL( const OUString & inPath,
Init( rEnv );
- boost::shared_ptr<SerfRequestProcessor> aReqProc( createReqProc( inPath ) );
+ std::shared_ptr<SerfRequestProcessor> aReqProc( createReqProc( inPath ) );
apr_status_t status = APR_SUCCESS;
aReqProc->processMkCol( status );
@@ -921,7 +921,7 @@ void SerfSession::COPY( const OUString & inSourceURL,
Init( rEnv );
SerfUri theSourceUri( inSourceURL );
- boost::shared_ptr<SerfRequestProcessor> aReqProc( createReqProc( theSourceUri.GetPath() ) );
+ std::shared_ptr<SerfRequestProcessor> aReqProc( createReqProc( theSourceUri.GetPath() ) );
apr_status_t status = APR_SUCCESS;
aReqProc->processCopy( inDestinationURL, inOverWrite, status );
@@ -942,7 +942,7 @@ void SerfSession::MOVE( const OUString & inSourceURL,
Init( rEnv );
SerfUri theSourceUri( inSourceURL );
- boost::shared_ptr<SerfRequestProcessor> aReqProc( createReqProc( theSourceUri.GetPath() ) );
+ std::shared_ptr<SerfRequestProcessor> aReqProc( createReqProc( theSourceUri.GetPath() ) );
apr_status_t status = APR_SUCCESS;
aReqProc->processMove( inDestinationURL, inOverWrite, status );
@@ -960,7 +960,7 @@ void SerfSession::DESTROY( const OUString & inPath,
Init( rEnv );
- boost::shared_ptr<SerfRequestProcessor> aReqProc( createReqProc( inPath ) );
+ std::shared_ptr<SerfRequestProcessor> aReqProc( createReqProc( inPath ) );
apr_status_t status = APR_SUCCESS;
aReqProc->processDelete( status );
@@ -1010,7 +1010,7 @@ void SerfSession::LOCK( const OUString & inPath,
Init( rEnv );
- boost::shared_ptr<SerfRequestProcessor> aReqProc( createReqProc( inPath ) );
+ std::shared_ptr<SerfRequestProcessor> aReqProc( createReqProc( inPath ) );
aReqProc->processLock( rLock );
HandleError( aReqProc );
@@ -1065,7 +1065,7 @@ bool SerfSession::LOCK( const OUString& rLock,
{
osl::Guard< osl::Mutex > theGuard( m_aMutex );
- boost::shared_ptr<SerfRequestProcessor> aReqProc( createReqProc( rLock ) );
+ std::shared_ptr<SerfRequestProcessor> aReqProc( createReqProc( rLock ) );
aReqProc->processLock( ucb::Lock(), plastChanceToSendRefreshRequest );
try
@@ -1092,7 +1092,7 @@ void SerfSession::UNLOCK( const OUString & inPath,
Init( rEnv );
- boost::shared_ptr<SerfRequestProcessor> aReqProc( createReqProc( inPath ) );
+ std::shared_ptr<SerfRequestProcessor> aReqProc( createReqProc( inPath ) );
aReqProc->processUnlock();
try
@@ -1114,7 +1114,7 @@ void SerfSession::UNLOCK( const OUString& rLock )
{
osl::Guard< osl::Mutex > theGuard( m_aMutex );
- boost::shared_ptr<SerfRequestProcessor> aReqProc( createReqProc( rLock ) );
+ std::shared_ptr<SerfRequestProcessor> aReqProc( createReqProc( rLock ) );
aReqProc->processUnlock();
try
@@ -1250,7 +1250,7 @@ bool SerfSession::removeExpiredLocktoken( const OUString & /*inURL*/,
// HandleError
// Common Error Handler
-void SerfSession::HandleError( boost::shared_ptr<SerfRequestProcessor> rReqProc )
+void SerfSession::HandleError( std::shared_ptr<SerfRequestProcessor> rReqProc )
throw ( DAVException )
{
m_aEnv = DAVRequestEnvironment();
diff --git a/ucb/source/ucp/webdav/SerfSession.hxx b/ucb/source/ucp/webdav/SerfSession.hxx
index 2d5abea..e9fb8d2 100644
--- a/ucb/source/ucp/webdav/SerfSession.hxx
+++ b/ucb/source/ucp/webdav/SerfSession.hxx
@@ -22,9 +22,9 @@
#ifndef INCLUDED_UCB_SOURCE_UCP_WEBDAV_SERFSESSION_HXX
#define INCLUDED_UCB_SOURCE_UCP_WEBDAV_SERFSESSION_HXX
-#include <vector>
-#include <boost/shared_ptr.hpp>
#include <osl/mutex.hxx>
+#include <memory>
+#include <vector>
#include "DAVSession.hxx"
#include "SerfUri.hxx"
@@ -259,7 +259,7 @@ private:
void Init( const DAVRequestEnvironment & rEnv )
throw ( DAVException );
- void HandleError( boost::shared_ptr<SerfRequestProcessor> rReqProc )
+ void HandleError( std::shared_ptr<SerfRequestProcessor> rReqProc )
throw ( DAVException );
const ucbhelper::InternetProxyServer & getProxySettings() const;
diff --git a/vcl/osx/OSXTransferable.hxx b/vcl/osx/OSXTransferable.hxx
index 79ae6be..dddaac6 100644
--- a/vcl/osx/OSXTransferable.hxx
+++ b/vcl/osx/OSXTransferable.hxx
@@ -31,8 +31,8 @@
#import <Cocoa/Cocoa.h>
#include <postmac.h>
-#include <boost/shared_ptr.hpp>
#include <boost/noncopyable.hpp>
+#include <memory>
#include <vector>
class OSXTransferable : public ::cppu::WeakImplHelper<com::sun::star::datatransfer::XTransferable>,
More information about the Libreoffice-commits
mailing list