diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2015-09-14 09:21:33 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2015-09-14 12:54:25 +0000 |
| commit | 22b80ac8e213ff63ce4f60e7d491f12cb42db313 (patch) | |
| tree | b00f1ed362747a05d79686a8709c3408cfdee59b /opencl | |
| parent | d8026ad65c8d50868f0f2fc0d2bd95820cddea83 (diff) | |
boost->std
Change-Id: I3fd9e1599c5ad812879a58cf1dabbcd393105e1c
Reviewed-on: https://gerrit.libreoffice.org/18564
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 'opencl')
| -rw-r--r-- | opencl/source/opencl_device.cxx | 5 | ||||
| -rw-r--r-- | opencl/source/openclconfig.cxx | 1 | ||||
| -rw-r--r-- | opencl/source/openclwrapper.cxx | 8 |
3 files changed, 6 insertions, 8 deletions
diff --git a/opencl/source/opencl_device.cxx b/opencl/source/opencl_device.cxx index 646bbb93cfb1..491323db15dc 100644 --- a/opencl/source/opencl_device.cxx +++ b/opencl/source/opencl_device.cxx @@ -21,10 +21,9 @@ #include <float.h> #include <iostream> #include <sstream> +#include <memory> #include <vector> -#include <boost/scoped_ptr.hpp> - #include <comphelper/random.hxx> #include <opencl/openclconfig.hxx> #include <opencl/openclwrapper.hxx> @@ -517,7 +516,7 @@ ds_device getDeviceSelection(const char* sProfilePath, bool bForceSelection) } /* Populate input data for micro-benchmark */ - boost::scoped_ptr<LibreOfficeDeviceEvaluationIO> testData(new LibreOfficeDeviceEvaluationIO); + std::unique_ptr<LibreOfficeDeviceEvaluationIO> testData(new LibreOfficeDeviceEvaluationIO); testData->inputSize = INPUTSIZE; testData->outputSize = OUTPUTSIZE; testData->input0.resize(testData->inputSize); diff --git a/opencl/source/openclconfig.cxx b/opencl/source/openclconfig.cxx index 688dab17bf5f..3c5dde5a0417 100644 --- a/opencl/source/openclconfig.cxx +++ b/opencl/source/openclconfig.cxx @@ -7,7 +7,6 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -#include <boost/shared_ptr.hpp> #include <unicode/regex.h> #include <comphelper/configuration.hxx> diff --git a/opencl/source/openclwrapper.cxx b/opencl/source/openclwrapper.cxx index d6041e6c850b..ea0f3f864053 100644 --- a/opencl/source/openclwrapper.cxx +++ b/opencl/source/openclwrapper.cxx @@ -136,11 +136,11 @@ OString createFileName(cl_device_id deviceId, const char* clFileName) aHash + ".bin"; } -std::vector<boost::shared_ptr<osl::File> > binaryGenerated( const char * clFileName, cl_context context ) +std::vector<std::shared_ptr<osl::File> > binaryGenerated( const char * clFileName, cl_context context ) { size_t numDevices=0; - std::vector<boost::shared_ptr<osl::File> > aGeneratedFiles; + std::vector<std::shared_ptr<osl::File> > aGeneratedFiles; cl_int clStatus = clGetContextInfo( context, CL_CONTEXT_DEVICES, 0, NULL, &numDevices ); numDevices /= sizeof(numDevices); @@ -164,7 +164,7 @@ std::vector<boost::shared_ptr<osl::File> > binaryGenerated( const char * clFileN osl::File* pNewFile = new osl::File(rtl::OStringToOUString(fileName, RTL_TEXTENCODING_UTF8)); if(pNewFile->open(osl_File_OpenFlag_Read) == osl::FileBase::E_None) { - aGeneratedFiles.push_back(boost::shared_ptr<osl::File>(pNewFile)); + aGeneratedFiles.push_back(std::shared_ptr<osl::File>(pNewFile)); SAL_INFO("opencl.file", "Opening binary file '" << fileName << "' for reading: success"); } else @@ -397,7 +397,7 @@ bool buildProgramFromBinary(const char* buildOption, GPUEnv* gpuInfo, const char numDevices /= sizeof(numDevices); CHECK_OPENCL( clStatus, "clGetContextInfo" ); - std::vector<boost::shared_ptr<osl::File> > aGeneratedFiles = binaryGenerated( + std::vector<std::shared_ptr<osl::File> > aGeneratedFiles = binaryGenerated( filename, gpuInfo->mpContext ); if (aGeneratedFiles.size() == numDevices) |