diff options
Diffstat (limited to 'jvmfwk/source')
| -rw-r--r-- | jvmfwk/source/framework.cxx | 4 | ||||
| -rw-r--r-- | jvmfwk/source/fwkutil.cxx | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/jvmfwk/source/framework.cxx b/jvmfwk/source/framework.cxx index eff92ecb2713..f15a045f542d 100644 --- a/jvmfwk/source/framework.cxx +++ b/jvmfwk/source/framework.cxx @@ -17,7 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include "boost/scoped_array.hpp" +#include <memory> #include "rtl/ustring.hxx" #include "rtl/bootstrap.hxx" #include "osl/thread.hxx" @@ -305,7 +305,7 @@ javaFrameworkError SAL_CALL jfw_startVM( // create JavaVMOptions array that is passed to the plugin // it contains the classpath and all options set in the //options dialog - boost::scoped_array<JavaVMOption> sarJOptions( + std::unique_ptr<JavaVMOption[]> sarJOptions( new JavaVMOption[cOptions + 2 + vmParams.size()]); JavaVMOption * arOpt = sarJOptions.get(); if (! arOpt) diff --git a/jvmfwk/source/fwkutil.cxx b/jvmfwk/source/fwkutil.cxx index fcb622f2728a..a48f25faa977 100644 --- a/jvmfwk/source/fwkutil.cxx +++ b/jvmfwk/source/fwkutil.cxx @@ -46,7 +46,7 @@ #include "framework.hxx" #include "fwkutil.hxx" -#include <boost/scoped_array.hpp> +#include <memory> using namespace osl; @@ -115,7 +115,7 @@ rtl::ByteSequence encodeBase16(const rtl::ByteSequence& rawData) static const char EncodingTable[] = {'0','1','2','3','4','5','6','7','8','9','A','B','C','D','E','F'}; sal_Int32 lenRaw = rawData.getLength(); - boost::scoped_array<char> pBuf(new char[lenRaw * 2]); + std::unique_ptr<char[]> pBuf(new char[lenRaw * 2]); const sal_Int8* arRaw = rawData.getConstArray(); char* pCurBuf = pBuf.get(); @@ -144,7 +144,7 @@ rtl::ByteSequence decodeBase16(const rtl::ByteSequence& data) {'0','1','2','3','4','5','6','7','8','9','A','B','C','D','E','F'}; sal_Int32 lenData = data.getLength(); sal_Int32 lenBuf = lenData / 2; //always divisable by two - boost::scoped_array<unsigned char> pBuf(new unsigned char[lenBuf]); + std::unique_ptr<unsigned char[]> pBuf(new unsigned char[lenBuf]); const sal_Int8* pData = data.getConstArray(); for (sal_Int32 i = 0; i < lenBuf; i++) { |