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 /test | |
| 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 'test')
| -rw-r--r-- | test/source/bootstrapfixture.cxx | 4 | ||||
| -rw-r--r-- | test/source/htmltesttools.cxx | 4 | ||||
| -rw-r--r-- | test/source/xmltesttools.cxx | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/test/source/bootstrapfixture.cxx b/test/source/bootstrapfixture.cxx index 40a68ce1f694..b7ad99b0ad81 100644 --- a/test/source/bootstrapfixture.cxx +++ b/test/source/bootstrapfixture.cxx @@ -32,7 +32,7 @@ #include <isheadless.hxx> -#include <boost/scoped_array.hpp> +#include <memory> #include <cstring> using namespace ::com::sun::star; @@ -138,7 +138,7 @@ OString loadFile(const OUString& rURL) CPPUNIT_ASSERT_EQUAL(eStatus, osl::FileBase::E_None); sal_uInt64 nSize; aFile.getSize(nSize); - boost::scoped_array<char> aBytes(new char[nSize]); + std::unique_ptr<char[]> aBytes(new char[nSize]); sal_uInt64 nBytesRead; aFile.read(aBytes.get(), nSize, nBytesRead); CPPUNIT_ASSERT_EQUAL(nSize, nBytesRead); diff --git a/test/source/htmltesttools.cxx b/test/source/htmltesttools.cxx index 274166bde855..85d65c0c0d71 100644 --- a/test/source/htmltesttools.cxx +++ b/test/source/htmltesttools.cxx @@ -9,7 +9,7 @@ #include <test/htmltesttools.hxx> -#include <boost/scoped_array.hpp> +#include <memory> htmlDocPtr HtmlTestTools::parseHtml(utl::TempFile& aTempFile) { @@ -27,7 +27,7 @@ htmlDocPtr HtmlTestTools::parseHtml(utl::TempFile& aTempFile) htmlDocPtr HtmlTestTools::parseHtmlStream(SvStream* pStream) { sal_Size nSize = pStream->remainingSize(); - boost::scoped_array<sal_uInt8> pBuffer(new sal_uInt8[nSize + 1]); + std::unique_ptr<sal_uInt8[]> pBuffer(new sal_uInt8[nSize + 1]); pStream->Read(pBuffer.get(), nSize); pBuffer[nSize] = 0; return htmlParseDoc(reinterpret_cast<xmlChar*>(pBuffer.get()), NULL); diff --git a/test/source/xmltesttools.cxx b/test/source/xmltesttools.cxx index 749e87e89cf2..f1b6484f107e 100644 --- a/test/source/xmltesttools.cxx +++ b/test/source/xmltesttools.cxx @@ -9,7 +9,7 @@ #include <test/xmltesttools.hxx> -#include <boost/scoped_array.hpp> +#include <memory> namespace { @@ -43,7 +43,7 @@ xmlDocPtr XmlTestTools::parseXml(utl::TempFile& aTempFile) xmlDocPtr XmlTestTools::parseXmlStream(SvStream* pStream) { sal_Size nSize = pStream->remainingSize(); - boost::scoped_array<sal_uInt8> pBuffer(new sal_uInt8[nSize + 1]); + std::unique_ptr<sal_uInt8[]> pBuffer(new sal_uInt8[nSize + 1]); pStream->Read(pBuffer.get(), nSize); pBuffer[nSize] = 0; return xmlParseDoc(reinterpret_cast<xmlChar*>(pBuffer.get())); |