From 09800956191c90035872cbc18cd304fee043c710 Mon Sep 17 00:00:00 2001
From: Takeshi Abe <tabe@fixedpoint.jp>
Date: Mon, 15 Jun 2015 17:58:15 +0900
Subject: Replace boost::scoped_array<T> with std::unique_ptr<T[]>
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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>
---
 formula/source/core/api/token.cxx | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'formula')

diff --git a/formula/source/core/api/token.cxx b/formula/source/core/api/token.cxx
index 0d272fb1baf2..6e938cdf0d13 100644
--- a/formula/source/core/api/token.cxx
+++ b/formula/source/core/api/token.cxx
@@ -31,7 +31,7 @@
 #include "formula/FormulaCompiler.hxx"
 #include <formula/compiler.hrc>
 #include <svl/sharedstringpool.hxx>
-#include <boost/scoped_array.hpp>
+#include <memory>
 
 namespace formula
 {
@@ -965,7 +965,7 @@ bool FormulaTokenArray::HasMatrixDoubleRefOps()
     {
         // RPN-Interpreter simulation.
         // Simply assumes a double as return value of each function.
-        boost::scoped_array<FormulaToken*> pStack(new FormulaToken* [nRPN]);
+        std::unique_ptr<FormulaToken*[]> pStack(new FormulaToken* [nRPN]);
         FormulaToken* pResult = new FormulaDoubleToken( 0.0 );
         short sp = 0;
         for ( sal_uInt16 j = 0; j < nRPN; j++ )
-- 
cgit