diff options
| author | Kohei Yoshida <kohei.yoshida@collabora.com> | 2013-09-10 17:10:15 -0400 |
|---|---|---|
| committer | Markus Mohrhard <markus.mohrhard@googlemail.com> | 2013-09-19 17:03:15 +0200 |
| commit | f22e509c2b31ee2ed024412af5b55bf8944e76b4 (patch) | |
| tree | 447c8e353e2cf87a007c27a9bfd432c9c83530da | |
| parent | 645e09ff13882af259c76fbeed8163e69844d721 (diff) | |
Disable dummy and groundwater interpreters from the default build.
They are of no use in the default build.
Change-Id: Ie3b874a5c78123436736318357fa48baafd991f3
| -rw-r--r-- | sc/source/core/opencl/formulagroupcl.cxx | 8 | ||||
| -rw-r--r-- | sc/source/core/tool/formulagroup.cxx | 2 |
2 files changed, 9 insertions, 1 deletions
diff --git a/sc/source/core/opencl/formulagroupcl.cxx b/sc/source/core/opencl/formulagroupcl.cxx index 62d70de545b9..dada7e082fc7 100644 --- a/sc/source/core/opencl/formulagroupcl.cxx +++ b/sc/source/core/opencl/formulagroupcl.cxx @@ -18,6 +18,8 @@ #include "openclwrapper.hxx" +#define USE_GROUNDWATER_INTERPRETER 0 + #define SRCDATASIZE 100 #define SINGLEARRAYLEN 100 #define DOUBLEARRAYLEN 100 @@ -947,6 +949,8 @@ bool FormulaGroupInterpreterOpenCL::interpret( ScDocument& rDoc, const ScAddress return false; } +#if USE_GROUNDWATER_INTERPRETER + /// Special case of formula compiler for groundwatering class FormulaGroupInterpreterGroundwater : public FormulaGroupInterpreterSoftware { @@ -1061,13 +1065,17 @@ bool FormulaGroupInterpreterGroundwater::interpret(ScDocument& rDoc, const ScAdd return true; } +#endif + sc::FormulaGroupInterpreter *createFormulaGroupInterpreter() { if (getenv("SC_SOFTWARE")) return NULL; +#if USE_GROUNDWATER_INTERPRETER if (getenv("SC_GROUNDWATER")) return new FormulaGroupInterpreterGroundwater(); +#endif return new FormulaGroupInterpreterOpenCL(); } diff --git a/sc/source/core/tool/formulagroup.cxx b/sc/source/core/tool/formulagroup.cxx index d8ba564311f0..04bec4fb854a 100644 --- a/sc/source/core/tool/formulagroup.cxx +++ b/sc/source/core/tool/formulagroup.cxx @@ -21,7 +21,7 @@ #include <vector> #include <boost/unordered_map.hpp> -#define USE_DUMMY_INTERPRETER 1 +#define USE_DUMMY_INTERPRETER 0 #if USE_DUMMY_INTERPRETER #include <cstdio> |