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 /basic/source/runtime/runtime.cxx | |
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 'basic/source/runtime/runtime.cxx')
-rw-r--r-- | basic/source/runtime/runtime.cxx | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/basic/source/runtime/runtime.cxx b/basic/source/runtime/runtime.cxx index 4ccf50582a40..e71fe1352ada 100644 --- a/basic/source/runtime/runtime.cxx +++ b/basic/source/runtime/runtime.cxx @@ -67,7 +67,7 @@ #include "sbintern.hxx" #include "sbunoobj.hxx" #include <basic/codecompletecache.hxx> -#include <boost/scoped_array.hpp> +#include <memory> using com::sun::star::uno::Reference; @@ -2263,9 +2263,9 @@ void SbiRuntime::StepREDIMP() else if (nDims > 0) { // Store dims to use them for copying later - boost::scoped_array<sal_Int32> pLowerBounds(new sal_Int32[nDims]); - boost::scoped_array<sal_Int32> pUpperBounds(new sal_Int32[nDims]); - boost::scoped_array<sal_Int32> pActualIndices(new sal_Int32[nDims]); + std::unique_ptr<sal_Int32[]> pLowerBounds(new sal_Int32[nDims]); + std::unique_ptr<sal_Int32[]> pUpperBounds(new sal_Int32[nDims]); + std::unique_ptr<sal_Int32[]> pActualIndices(new sal_Int32[nDims]); // Compare bounds for( short i = 1 ; i <= nDims ; i++ ) @@ -4436,9 +4436,9 @@ void SbiRuntime::StepDCREATE_IMPL( sal_uInt32 nOp1, sal_uInt32 nOp2 ) bool bRangeError = false; // Store dims to use them for copying later - boost::scoped_array<sal_Int32> pLowerBounds(new sal_Int32[nDims]); - boost::scoped_array<sal_Int32> pUpperBounds(new sal_Int32[nDims]); - boost::scoped_array<sal_Int32> pActualIndices(new sal_Int32[nDims]); + std::unique_ptr<sal_Int32[]> pLowerBounds(new sal_Int32[nDims]); + std::unique_ptr<sal_Int32[]> pUpperBounds(new sal_Int32[nDims]); + std::unique_ptr<sal_Int32[]> pActualIndices(new sal_Int32[nDims]); if( nDimsOld != nDimsNew ) { bRangeError = true; |