diff options
| author | Tor Lillqvist <tml@collabora.com> | 2014-11-27 15:13:12 +0200 |
|---|---|---|
| committer | Tor Lillqvist <tml@collabora.com> | 2014-11-28 10:24:20 +0200 |
| commit | 87c18d6f4cb9bcb8c4c9e2c80e4d779f01675ff6 (patch) | |
| tree | b4e1442dfe3c2b45b93113f7f4ba653e9c2647a3 /sc/source/core/tool | |
| parent | d4f63f5e767d23675240e9dd6d95fc9496ad9df5 (diff) | |
Move more Calc-independent OpenCL stuff from the sc to the opencl module
No cleanups yet. Just removed the "sc" namespace parts now when this stuff is
no longer Calc-specific. There is still horribly confusing use of the same
OpenCLDevice name for both a class and as a namespace, for instance. And the
OpenCLDevice class has only public static members even, so effectively it acts
as just a namespace anyway... Etc.
Change-Id: Idc5f30a721df0101426c676f04a85e02c5dc8443
Diffstat (limited to 'sc/source/core/tool')
| -rw-r--r-- | sc/source/core/tool/formulagroup.cxx | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sc/source/core/tool/formulagroup.cxx b/sc/source/core/tool/formulagroup.cxx index 328e3c3b0083..cc4f80512376 100644 --- a/sc/source/core/tool/formulagroup.cxx +++ b/sc/source/core/tool/formulagroup.cxx @@ -35,7 +35,7 @@ #include <cstdio> #if HAVE_FEATURE_OPENCL -#include "openclwrapper.hxx" +#include <opencl/openclwrapper.hxx> #endif namespace sc { @@ -542,7 +542,7 @@ FormulaGroupInterpreter *FormulaGroupInterpreter::getStatic() void FormulaGroupInterpreter::fillOpenCLInfo(std::vector<OpenCLPlatformInfo>& rPlatforms) { const std::vector<OpenCLPlatformInfo>& rPlatformsFromWrapper = - sc::opencl::fillOpenCLInfo(); + ::opencl::fillOpenCLInfo(); rPlatforms.assign(rPlatformsFromWrapper.begin(), rPlatformsFromWrapper.end()); } @@ -564,7 +564,7 @@ bool FormulaGroupInterpreter::switchOpenCLDevice(const OUString& rDeviceId, bool msInstance = new sc::FormulaGroupInterpreterSoftware(); return true; } - bool bSuccess = sc::opencl::switchOpenCLDevice(&rDeviceId, bAutoSelect, bForceEvaluation); + bool bSuccess = ::opencl::switchOpenCLDevice(&rDeviceId, bAutoSelect, bForceEvaluation); if(!bSuccess) return false; @@ -591,7 +591,7 @@ void FormulaGroupInterpreter::getOpenCLDeviceInfo(sal_Int32& rDeviceId, sal_Int3 size_t aDeviceId = static_cast<size_t>(-1); size_t aPlatformId = static_cast<size_t>(-1); - sc::opencl::getOpenCLDeviceInfo(aDeviceId, aPlatformId); + ::opencl::getOpenCLDeviceInfo(aDeviceId, aPlatformId); rDeviceId = aDeviceId; rPlatformId = aPlatformId; } |