[Libreoffice-commits] core.git: sc/source

[Tor Lillqvist]

 sc/source/core/tool/formulagroup.cxx |    7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

New commits:
commit 3f317dbe71dcda974c0f322f0f4921e9e5e987f2
Author: Tor Lillqvist <tml at collabora.com>
Date:   Fri Sep 20 22:22:06 2013 +0300

    Make it compile in the DISABLE_DYNLOADING case
    
    Change-Id: I360ec27ff268b7189af2f001806c9af5806953a5

diff --git a/sc/source/core/tool/formulagroup.cxx b/sc/source/core/tool/formulagroup.cxx
index 0e8aa96..677ac9f 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
 }