diff options
| author | Kohei Yoshida <kohei.yoshida@collabora.com> | 2013-09-09 11:05:03 -0400 |
|---|---|---|
| committer | Kohei Yoshida <kohei.yoshida@collabora.com> | 2013-09-10 11:47:44 -0400 |
| commit | 2e5111f58994d6449fd03b1fc2c4971da78deded (patch) | |
| tree | dfd4a0047bb509ab893db74be08e05d1420ad23a /sc | |
| parent | f4d04f2014cedacdba3eec2177a3ba4acd3d6b6f (diff) | |
The OpenCL interpreter doesn't have to be a child class of the S/W one.
Change-Id: Idcc28b98fceaffdc8947410fef5fadbae462450b
Diffstat (limited to 'sc')
| -rw-r--r-- | sc/source/core/opencl/formulagroupcl.cxx | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/sc/source/core/opencl/formulagroupcl.cxx b/sc/source/core/opencl/formulagroupcl.cxx index 0f8b46f9988a..279ac2d63b31 100644 --- a/sc/source/core/opencl/formulagroupcl.cxx +++ b/sc/source/core/opencl/formulagroupcl.cxx @@ -104,7 +104,7 @@ public: }; -class FormulaGroupInterpreterOpenCL : public FormulaGroupInterpreterSoftware +class FormulaGroupInterpreterOpenCL : public FormulaGroupInterpreter { SourceData *mSrcDataStack[SRCDATASIZE]; unsigned int mnStackPointer,mnDoublePtrCount; @@ -124,7 +124,7 @@ class FormulaGroupInterpreterOpenCL : public FormulaGroupInterpreterSoftware size_t mnRowSize; public: FormulaGroupInterpreterOpenCL() : - FormulaGroupInterpreterSoftware() + FormulaGroupInterpreter() { mnStackPointer = 0; mnpOclEndPos = NULL; @@ -952,6 +952,9 @@ bool FormulaGroupInterpreterOpenCL::interpret( ScDocument& rDoc, const ScAddress /// Special case of formula compiler for groundwatering class FormulaGroupInterpreterGroundwater : public FormulaGroupInterpreterSoftware { + bool interpretCL(ScDocument& rDoc, const ScAddress& rTopPos, + const ScFormulaCellGroupRef& xGroup, ScTokenArray& rCode); + public: FormulaGroupInterpreterGroundwater() : FormulaGroupInterpreterSoftware() @@ -965,8 +968,6 @@ public: } virtual ScMatrixRef inverseMatrix(const ScMatrix& /* rMat */) { return ScMatrixRef(); } - virtual bool interpretCL(ScDocument& rDoc, const ScAddress& rTopPos, - const ScFormulaCellGroupRef& xGroup, ScTokenArray& rCode); virtual bool interpret(ScDocument& rDoc, const ScAddress& rTopPos, const ScFormulaCellGroupRef& xGroup, ScTokenArray& rCode); }; |