[Libreoffice-commits] core.git: Branch 'feature/calc-group-interpreter-2' - sc/source

[Kohei Yoshida]

 sc/source/core/opencl/formulagroupcl.cxx |    8 ++++++++
 sc/source/core/tool/formulagroup.cxx     |    2 +-
 2 files changed, 9 insertions(+), 1 deletion(-)

New commits:
commit 69df845f854d49f86e05ee9266054b38540726b3
Author: Kohei Yoshida <kohei.yoshida at collabora.com>
Date:   Tue Sep 10 17:10:15 2013 -0400

    Disable dummy and groundwater interpreters from the default build.
    
    They are of no use in the default build.
    
    Change-Id: Ie3b874a5c78123436736318357fa48baafd991f3

diff --git a/sc/source/core/opencl/formulagroupcl.cxx b/sc/source/core/opencl/formulagroupcl.cxx
index 352d0bf..4fe03ae 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
@@ -954,6 +956,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
 {
@@ -1068,13 +1072,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 d8ba564..04bec4f 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>