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

Andrzej Hunt andrzej.hunt at collabora.com
Fri Apr 25 01:10:24 PDT 2014


 sc/source/core/tool/formulagroup.cxx |    2 ++
 1 file changed, 2 insertions(+)

New commits:
commit 7f01a960995b728489ab359fc082609c75216f95
Author: Andrzej Hunt <andrzej.hunt at collabora.com>
Date:   Fri Apr 25 09:08:21 2014 +0100

    fix "Wrap opencl-only functions in appropriate ifdef."
    
    062871853cc420f35ddfbc2534f34c94f1b4c982
    (loplugin:unreffun fix) caused:
      'undefined reference to `sc::FormulaGroupInterpreter::msInstance'
    when building with --disable-opencl.
    
    (It appears I didn't check whether my build had fully completed before pushing.)
    
    Change-Id: I948205867985c7722662d673e95d5639bc9d9bcc

diff --git a/sc/source/core/tool/formulagroup.cxx b/sc/source/core/tool/formulagroup.cxx
index 56eae0d..d4e3710 100644
--- a/sc/source/core/tool/formulagroup.cxx
+++ b/sc/source/core/tool/formulagroup.cxx
@@ -533,9 +533,11 @@ typedef bool (*__switchOpenClDevice)(const OUString*, bool, bool);
 typedef void (*__getOpenCLDeviceInfo)(size_t*, size_t*);
 
 #endif
+#endif
 
 FormulaGroupInterpreter *FormulaGroupInterpreter::msInstance = NULL;
 
+#if HAVE_FEATURE_OPENCL
 #ifndef DISABLE_DYNLOADING
 
 osl::Module* getOpenCLModule()


More information about the Libreoffice-commits mailing list