diff options
| author | Tor Lillqvist <tml@collabora.com> | 2017-08-25 15:22:40 +0300 |
|---|---|---|
| committer | Tor Lillqvist <tml@collabora.com> | 2017-08-25 15:49:34 +0300 |
| commit | aa7dc5fa1df23f1a9079305cb362aab018e94848 (patch) | |
| tree | 68c4825581e939b4dd8af5c7d1fa7ef848bf4fb8 /desktop/source/app | |
| parent | 407a126af45d93f83eb4dbdc358dd569bea4db6f (diff) | |
Get rid of need to use initial :: for ::opencl to avoid clash with sc::opencl
Rename the global opencl namespace to openclwrapper. Its public API is
after all declared in a file called openclwrapper.hxx. The confusion
started when part of the OpenCL code was moved out from sc some years
ago.
Change-Id: I98ebd8498b2244804411e5de9169eb619f86070b
Diffstat (limited to 'desktop/source/app')
| -rw-r--r-- | desktop/source/app/opencl.cxx | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/desktop/source/app/opencl.cxx b/desktop/source/app/opencl.cxx index 05afc6411837..1dfc338b51d3 100644 --- a/desktop/source/app/opencl.cxx +++ b/desktop/source/app/opencl.cxx @@ -49,7 +49,7 @@ bool testOpenCLCompute(const Reference< XDesktop2 > &xDesktop, const OUString &r bool bSuccess = false; css::uno::Reference< css::lang::XComponent > xComponent; - sal_uInt64 nKernelFailures = opencl::kernelFailures; + sal_uInt64 nKernelFailures = openclwrapper::kernelFailures; SAL_INFO("opencl", "Starting CL test spreadsheet"); @@ -99,12 +99,12 @@ bool testOpenCLCompute(const Reference< XDesktop2 > &xDesktop, const OUString &r SAL_WARN("opencl", "OpenCL testing failed - disabling: " << e.Message); } - if (nKernelFailures != opencl::kernelFailures) + if (nKernelFailures != openclwrapper::kernelFailures) { // tdf#100883 - defeat SEH exception handling fallbacks. SAL_WARN("opencl", "OpenCL kernels failed to compile, " "or took SEH exceptions " - << nKernelFailures << " != " << opencl::kernelFailures); + << nKernelFailures << " != " << openclwrapper::kernelFailures); bSuccess = false; } @@ -119,7 +119,7 @@ bool testOpenCLCompute(const Reference< XDesktop2 > &xDesktop, const OUString &r void Desktop::CheckOpenCLCompute(const Reference< XDesktop2 > &xDesktop) { - if (!opencl::canUseOpenCL() || Application::IsSafeModeEnabled()) + if (!openclwrapper::canUseOpenCL() || Application::IsSafeModeEnabled()) return; SAL_INFO("opencl", "Initiating test of OpenCL device"); @@ -128,7 +128,7 @@ void Desktop::CheckOpenCLCompute(const Reference< XDesktop2 > &xDesktop) OUString aDevice = officecfg::Office::Calc::Formula::Calculation::OpenCLDevice::get(); OUString aSelectedCLDeviceVersionID; - if (!opencl::switchOpenCLDevice( + if (!openclwrapper::switchOpenCLDevice( &aDevice, officecfg::Office::Calc::Formula::Calculation::OpenCLAutoSelect::get(), false /* bForceEvaluation */, |