diff options
| author | Tor Lillqvist <tml@collabora.com> | 2013-10-09 16:54:11 +0300 |
|---|---|---|
| committer | Tor Lillqvist <tml@collabora.com> | 2013-10-09 17:03:14 +0300 |
| commit | ff3b823ef4b867263711703fab596584314e4f58 (patch) | |
| tree | 3ca56388610a71806e2e6063c32ac27ce002d3c3 | |
| parent | d9c5452a15510b81edc59605ca234b8f61d478e7 (diff) | |
Fix for !HAVE_FEATURE_OPENCL
Change-Id: I98cc2819e5de88cdce235735518b64193610fdc6
| -rw-r--r-- | sc/source/core/tool/formulagroup.cxx | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/sc/source/core/tool/formulagroup.cxx b/sc/source/core/tool/formulagroup.cxx index 21edd7e4c591..96ae83e46800 100644 --- a/sc/source/core/tool/formulagroup.cxx +++ b/sc/source/core/tool/formulagroup.cxx @@ -7,6 +7,8 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ +#include <config_features.h> + #include "formulagroup.hxx" #include "document.hxx" #include "formulacell.hxx" @@ -17,7 +19,6 @@ #include "formula/vectortoken.hxx" #include "rtl/bootstrap.hxx" -#include "config_features.h" #include <vector> #include <boost/unordered_map.hpp> @@ -422,6 +423,7 @@ void FormulaGroupInterpreter::switchOpenCLDevice(const OUString& rDeviceId, bool msInstance = new sc::FormulaGroupInterpreterSoftware(); return; } +#if HAVE_FEATURE_OPENCL #ifndef DISABLE_DYNLOADING osl::Module* pModule = getOpenCLModule(); if (!pModule) @@ -439,12 +441,14 @@ void FormulaGroupInterpreter::switchOpenCLDevice(const OUString& rDeviceId, bool if(!bSuccess) return; #endif +#else + (void) bAutoSelect; +#endif delete msInstance; msInstance = NULL; #if HAVE_FEATURE_OPENCL - if ( ScInterpreter::GetGlobalConfig().mbOpenCLEnabled ) { #ifdef DISABLE_DYNLOADING @@ -469,6 +473,7 @@ void FormulaGroupInterpreter::compileOpenCLKernels() // OpenCL is not enabled. return; +#if HAVE_FEATURE_OPENCL #ifndef DISABLE_DYNLOADING osl::Module* pModule = getOpenCLModule(); if (!pModule) @@ -482,6 +487,7 @@ void FormulaGroupInterpreter::compileOpenCLKernels() #else ::compileOpenCLKernels(&rConfig.maOpenCLDevice); #endif +#endif } void FormulaGroupInterpreter::generateRPNCode(ScDocument& rDoc, const ScAddress& rPos, ScTokenArray& rCode) |