[Libreoffice-commits] core.git: Branch 'private/kohei/formula-opencl-work' - sc/source

Kohei Yoshida kohei.yoshida at collabora.com
Mon Sep 9 08:04:11 PDT 2013


 sc/source/core/opencl/formulagroupcl.cxx |    9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

New commits:
commit 8b7b76cfeead4c77af0c34d64eb17b0bd476e20a
Author: Kohei Yoshida <kohei.yoshida at collabora.com>
Date:   Mon Sep 9 11:05:03 2013 -0400

    The OpenCL interpreter doesn't have to be a child class of the S/W one.
    
    Change-Id: Idcc28b98fceaffdc8947410fef5fadbae462450b

diff --git a/sc/source/core/opencl/formulagroupcl.cxx b/sc/source/core/opencl/formulagroupcl.cxx
index 0f8b46f..279ac2d 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);
 };


More information about the Libreoffice-commits mailing list