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 /cui | |
parent | loplugin:constparam in sc part6 (diff) | |
download | core-aa7dc5fa1df23f1a9079305cb362aab018e94848.tar.gz core-aa7dc5fa1df23f1a9079305cb362aab018e94848.zip |
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 'cui')
-rw-r--r-- | cui/source/dialogs/about.cxx | 2 | ||||
-rw-r--r-- | cui/source/options/optopencl.cxx | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/cui/source/dialogs/about.cxx b/cui/source/dialogs/about.cxx index 914c47438fcb..d5f0d2eabe89 100644 --- a/cui/source/dialogs/about.cxx +++ b/cui/source/dialogs/about.cxx @@ -335,7 +335,7 @@ OUString AboutDialog::GetVersionString() #if HAVE_FEATURE_OPENCL OUString aCalcMode = "Calc: "; // Calc calculation mode bool bSWInterp = officecfg::Office::Common::Misc::UseSwInterpreter::get(); - bool bOpenCL = opencl::GPUEnv::isOpenCLEnabled(); + bool bOpenCL = openclwrapper::GPUEnv::isOpenCLEnabled(); if (bOpenCL) aCalcMode += "CL"; else if (bSWInterp) diff --git a/cui/source/options/optopencl.cxx b/cui/source/options/optopencl.cxx index 731f385976be..5e94bda5a12a 100644 --- a/cui/source/options/optopencl.cxx +++ b/cui/source/options/optopencl.cxx @@ -54,7 +54,7 @@ SvxOpenCLTabPage::SvxOpenCLTabPage(vcl::Window* pParent, const SfxItemSet& rSet) mpUseOpenCL->Check(maConfig.mbUseOpenCL); mpUseOpenCL->Enable(!officecfg::Office::Common::Misc::UseOpenCL::isReadOnly()); - bool bCLUsed = opencl::GPUEnv::isOpenCLEnabled(); + bool bCLUsed = openclwrapper::GPUEnv::isOpenCLEnabled(); mpOclUsed->Show(bCLUsed); mpOclNotUsed->Show(!bCLUsed); } |