diff options
| author | Takeshi Abe <tabe@fixedpoint.jp> | 2015-06-15 17:58:15 +0900 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2015-06-17 15:50:45 +0000 |
| commit | 09800956191c90035872cbc18cd304fee043c710 (patch) | |
| tree | 9d255ad7629fedc181e8b5cf965a3075a328caaf /xmlsecurity | |
| parent | 9cc52266bd1a4d01552675f151ce2da8c5210f84 (diff) | |
Replace boost::scoped_array<T> with std::unique_ptr<T[]>
This may reduce some degree of dependency on boost.
Done by running a script like:
git grep -l '#include *.boost/scoped_array.hpp.' \
| xargs sed -i -e 's@#include *.boost/scoped_array.hpp.@#include <memory>@'
git grep -l '\(boost::\)\?scoped_array<\([^<>]*\)>' \
| xargs sed -i -e 's/\(boost::\)\?scoped_array<\([^<>]*\)>/std::unique_ptr<\2[]>/'
... and then killing duplicate or unnecessary includes,
while changing manually
m_xOutlineStylesCandidates in xmloff/source/text/txtimp.cxx,
extensions/source/ole/unoconversionutilities.hxx, and
extensions/source/ole/oleobjw.cxx.
Change-Id: I3955ed3ad99b94499a7bd0e6e3a09078771f9bfd
Reviewed-on: https://gerrit.libreoffice.org/16289
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'xmlsecurity')
| -rw-r--r-- | xmlsecurity/inc/pch/precompiled_xsec_xmlsec.hxx | 2 | ||||
| -rw-r--r-- | xmlsecurity/source/xmlsec/nss/nssinitializer.cxx | 6 | ||||
| -rw-r--r-- | xmlsecurity/source/xmlsec/nss/securityenvironment_nssimpl.cxx | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/xmlsecurity/inc/pch/precompiled_xsec_xmlsec.hxx b/xmlsecurity/inc/pch/precompiled_xsec_xmlsec.hxx index 092c5c12b211..21050aec8a39 100644 --- a/xmlsecurity/inc/pch/precompiled_xsec_xmlsec.hxx +++ b/xmlsecurity/inc/pch/precompiled_xsec_xmlsec.hxx @@ -16,7 +16,7 @@ #include "libxml/parserInternals.h" #include <boost/noncopyable.hpp> -#include <boost/scoped_array.hpp> +#include <memory> #include <com/sun/star/lang/XServiceInfo.hpp> #include <com/sun/star/lang/XSingleServiceFactory.hpp> #include <com/sun/star/mozilla/XMozillaBootstrap.hpp> diff --git a/xmlsecurity/source/xmlsec/nss/nssinitializer.cxx b/xmlsecurity/source/xmlsec/nss/nssinitializer.cxx index 8e7498a47cab..a61ebd6e17eb 100644 --- a/xmlsecurity/source/xmlsec/nss/nssinitializer.cxx +++ b/xmlsecurity/source/xmlsec/nss/nssinitializer.cxx @@ -49,7 +49,7 @@ #include "digestcontext.hxx" #include "ciphercontext.hxx" -#include <boost/scoped_array.hpp> +#include <memory> #include <nspr.h> #include <cert.h> @@ -265,7 +265,7 @@ bool nsscrypto_initialize( const css::uno::Reference< css::uno::XComponentContex int errlen = PR_GetErrorTextLength(); if(errlen > 0) { - boost::scoped_array<char> const error(new char[errlen + 1]); + std::unique_ptr<char[]> const error(new char[errlen + 1]); PR_GetErrorText(error.get()); SAL_INFO("xmlsecurity.xmlsec", error.get()); } @@ -282,7 +282,7 @@ bool nsscrypto_initialize( const css::uno::Reference< css::uno::XComponentContex int errlen = PR_GetErrorTextLength(); if(errlen > 0) { - boost::scoped_array<char> const error(new char[errlen + 1]); + std::unique_ptr<char[]> const error(new char[errlen + 1]); PR_GetErrorText(error.get()); SAL_INFO("xmlsecurity.xmlsec", error.get()); } diff --git a/xmlsecurity/source/xmlsec/nss/securityenvironment_nssimpl.cxx b/xmlsecurity/source/xmlsec/nss/securityenvironment_nssimpl.cxx index 7b93d34dde0d..f0dfc81d93c3 100644 --- a/xmlsecurity/source/xmlsec/nss/securityenvironment_nssimpl.cxx +++ b/xmlsecurity/source/xmlsec/nss/securityenvironment_nssimpl.cxx @@ -38,7 +38,7 @@ #include <sal/log.hxx> #include <com/sun/star/task/InteractionHandler.hpp> #include <vector> -#include <boost/scoped_array.hpp> +#include <memory> #include <osl/thread.h> #include "secerror.hxx" @@ -923,7 +923,7 @@ xmlSecKeysMngrPtr SecurityEnvironment_NssImpl::createKeysManager() throw( Except * crypto engine */ int cSlots = m_Slots.size(); - boost::scoped_array<PK11SlotInfo*> sarSlots(new PK11SlotInfo*[cSlots]); + std::unique_ptr<PK11SlotInfo*[]> sarSlots(new PK11SlotInfo*[cSlots]); PK11SlotInfo** slots = sarSlots.get(); int count = 0; for (CIT_SLOTS islots = m_Slots.begin();islots != m_Slots.end(); islots++, count++) |