[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - sc/source
Matúš Kukan
matus.kukan at collabora.com
Fri Jan 3 02:21:04 PST 2014
sc/source/core/opencl/formulagroupcl.cxx | 2 +-
sc/source/core/opencl/op_statistical.cxx | 3 +--
2 files changed, 2 insertions(+), 3 deletions(-)
New commits:
commit 2e3904606d39d57bb33c8288680bca426557794c
Author: Matúš Kukan <matus.kukan at collabora.com>
Date: Fri Dec 20 15:58:57 2013 +0100
-Werror=unused-variable
Change-Id: I44e4f9a38deac882acbd444b5e7026d5019ea958
(cherry picked from commit 296b1e76071698c990e726d2f7935cef9ca07fbe)
diff --git a/sc/source/core/opencl/formulagroupcl.cxx b/sc/source/core/opencl/formulagroupcl.cxx
index 910a128..a17c34c 100644
--- a/sc/source/core/opencl/formulagroupcl.cxx
+++ b/sc/source/core/opencl/formulagroupcl.cxx
@@ -1554,7 +1554,7 @@ public:
if (OpSumCodeGen->NeedReductionKernel())
{
- assert(slidingArgPtr);
+ assert(slidingArgPtr); (void) slidingArgPtr;
std::vector<cl_mem> vclmem;
for (SubArgumentsType::iterator it = mvSubArguments.begin(),
e= mvSubArguments.end(); it!=e; ++it)
diff --git a/sc/source/core/opencl/op_statistical.cxx b/sc/source/core/opencl/op_statistical.cxx
index c7bf582..673ed21 100644
--- a/sc/source/core/opencl/op_statistical.cxx
+++ b/sc/source/core/opencl/op_statistical.cxx
@@ -4240,8 +4240,7 @@ void OpGeoMean::GenSlidingWindowFunction(
for(unsigned i=0;i<vSubArguments.size();i++)
{
- FormulaToken *pCur = vSubArguments[i]->GetFormulaToken();
- assert(pCur);
+ assert(vSubArguments[i]->GetFormulaToken());
if(vSubArguments[i]->GetFormulaToken()->GetType() ==
formula::svDoubleVectorRef)
More information about the Libreoffice-commits
mailing list