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 /stoc | |
| 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 'stoc')
| -rw-r--r-- | stoc/source/invocation/invocation.cxx | 4 | ||||
| -rw-r--r-- | stoc/source/javavm/javavm.cxx | 5 |
2 files changed, 4 insertions, 5 deletions
diff --git a/stoc/source/invocation/invocation.cxx b/stoc/source/invocation/invocation.cxx index a97c8046995e..8d195e965b88 100644 --- a/stoc/source/invocation/invocation.cxx +++ b/stoc/source/invocation/invocation.cxx @@ -48,7 +48,7 @@ #include <com/sun/star/lang/XTypeProvider.hpp> #include <com/sun/star/registry/XRegistryKey.hpp> -#include <boost/scoped_array.hpp> +#include <memory> #include <rtl/ustrbuf.hxx> #include <rtl/strbuf.hxx> @@ -757,7 +757,7 @@ void Invocation_Impl::getInfoSequenceImpl sal_Int32 nTotalCount = nNameAccessCount + nPropertyCount + nMethodCount; // Create and fill array of MemberItems - boost::scoped_array< MemberItem > pItems( new MemberItem[ nTotalCount ] ); + std::unique_ptr< MemberItem []> pItems( new MemberItem[ nTotalCount ] ); const OUString* pStrings = aNameAccessNames.getConstArray(); const Property* pProps = aPropertySeq.getConstArray(); const Reference< XIdlMethod >* pMethods = aMethodSeq.getConstArray(); diff --git a/stoc/source/javavm/javavm.cxx b/stoc/source/javavm/javavm.cxx index 8ccd0c108540..cad4d0dbed0f 100644 --- a/stoc/source/javavm/javavm.cxx +++ b/stoc/source/javavm/javavm.cxx @@ -79,7 +79,6 @@ #include <memory> #include <vector> #include <boost/noncopyable.hpp> -#include <boost/scoped_array.hpp> // Properties of the javavm can be put // as a komma separated list in this @@ -709,12 +708,12 @@ JavaVirtualMachine::getJavaVM(css::uno::Sequence< sal_Int8 > const & rProcessId) m_xContext); //Create the JavaVMOption array const std::vector<OUString> & props = aJvm.getProperties(); - boost::scoped_array<JavaVMOption> sarOptions( + std::unique_ptr<JavaVMOption[]> sarOptions( new JavaVMOption[props.size()]); JavaVMOption * arOptions = sarOptions.get(); //Create an array that contains the strings which are passed //into the options - boost::scoped_array<OString> sarPropStrings( + std::unique_ptr<OString[]> sarPropStrings( new OString[props.size()]); OString * arPropStrings = sarPropStrings.get(); |