summaryrefslogtreecommitdiff
path: root/sc
diff options
context:
space:
mode:
authorTor Lillqvist <tml@collabora.com>2013-09-20 22:22:06 +0300
committerTor Lillqvist <tml@collabora.com>2013-09-21 00:02:19 +0300
commit3f317dbe71dcda974c0f322f0f4921e9e5e987f2 (patch)
treee4bd442a6c9cdd337c5958ecc1d15f14fe1a4a96 /sc
parent740381502470e5d0e11e5db0a82f27a7d14f4d01 (diff)
Make it compile in the DISABLE_DYNLOADING case
Change-Id: I360ec27ff268b7189af2f001806c9af5806953a5
Diffstat (limited to 'sc')
-rw-r--r--sc/source/core/tool/formulagroup.cxx7
1 files changed, 3 insertions, 4 deletions
diff --git a/sc/source/core/tool/formulagroup.cxx b/sc/source/core/tool/formulagroup.cxx
index 0e8aa96d57b7..677ac9f9057e 100644
--- a/sc/source/core/tool/formulagroup.cxx
+++ b/sc/source/core/tool/formulagroup.cxx
@@ -29,7 +29,7 @@
#ifdef DISABLE_DYNLOADING
extern "C" size_t getOpenCLPlatformCount(void);
-extern "C" void fillOpenCLInfo(OpenclPlatformInfo*, size_t);
+extern "C" void fillOpenCLInfo(sc::OpenclPlatformInfo*, size_t);
extern "C" bool switchOpenClDevice(const OUString*, bool);
extern "C" sc::FormulaGroupInterpreter* createFormulaGroupOpenCLInterpreter();
extern "C" void compileOpenCLKernels(const OUString*);
@@ -417,7 +417,7 @@ void FormulaGroupInterpreter::fillOpenCLInfo(std::vector<OpenclPlatformInfo>& rP
return;
std::vector<OpenclPlatformInfo> aPlatforms(nPlatforms);
- fillOpenCLInfo(&aPlatforms[0], aPlatforms.size());
+ ::fillOpenCLInfo(&aPlatforms[0], aPlatforms.size());
rPlatforms.swap(aPlatforms);
#endif
}
@@ -497,8 +497,7 @@ void FormulaGroupInterpreter::compileOpenCLKernels()
reinterpret_cast<__compileOpenCLKernels>(fn)(&rConfig.maOpenCLDevice);
#else
-
- compileOpenCLKernels(&rConfig.maOpenCLDevice);
+ ::compileOpenCLKernels(&rConfig.maOpenCLDevice);
#endif
}