diff options
author | Miklos Vajna <vmiklos@collabora.co.uk> | 2013-12-20 08:43:25 +0100 |
---|---|---|
committer | Miklos Vajna <vmiklos@collabora.co.uk> | 2013-12-20 08:44:09 +0100 |
commit | dc43d82bb2fcc352b1249cfb99010a1533372928 (patch) | |
tree | 7080db905e517167934c298537832bf5189f125f | |
parent | 07484ee362a0f0d2d02f0564f711dbc332cf321d (diff) |
-Werror=unused-variable
Change-Id: Ieb7ec6ff5f1068dd7ec842263715be622b55c550
-rw-r--r-- | sc/source/core/opencl/op_database.cxx | 92 | ||||
-rw-r--r-- | sc/source/core/opencl/op_math.cxx | 9 | ||||
-rw-r--r-- | sc/source/core/opencl/op_statistical.cxx | 1 |
3 files changed, 0 insertions, 102 deletions
diff --git a/sc/source/core/opencl/op_database.cxx b/sc/source/core/opencl/op_database.cxx index dc35e3a78d47..fd35a791a0d1 100644 --- a/sc/source/core/opencl/op_database.cxx +++ b/sc/source/core/opencl/op_database.cxx @@ -103,11 +103,6 @@ void OpDmax::GenSlidingWindowFunction(std::stringstream &ss, if(vSubArguments[i]->GetFormulaToken()->GetType() != formula::svDoubleVectorRef) throw Unhandled(); - formula::FormulaToken *tmpCur_tmp = - vSubArguments[i]->GetFormulaToken(); - const formula::DoubleVectorRefToken*pCurDVR_tmp= - dynamic_cast<const formula::DoubleVectorRefToken *> - (tmpCur_tmp); ss << " tmp"<<i<<"="; ss << vSubArguments[i]->GenSlidingWindowDeclRef()<<";\n"; ss << " if(isNan(tmp"<<i<<"))\n"; @@ -126,9 +121,6 @@ void OpDmax::GenSlidingWindowFunction(std::stringstream &ss, throw Unhandled(); formula::FormulaToken *tmpCur_tmp = vSubArguments[i]->GetFormulaToken(); - const formula::DoubleVectorRefToken*pCurDVR_tmp= - dynamic_cast<const formula::DoubleVectorRefToken *> - (tmpCur_tmp); ss << " tmp"<<i<<"="; ss << vSubArguments[i]->GenSlidingWindowDeclRef()<<";\n"; ss << " if(!isNan(tmp"<<i<<")){\n"; @@ -246,9 +238,6 @@ void OpDmin::GenSlidingWindowFunction(std::stringstream &ss, throw Unhandled(); formula::FormulaToken *tmpCur_tmp = vSubArguments[i]->GetFormulaToken(); - const formula::DoubleVectorRefToken*pCurDVR_tmp= - dynamic_cast<const formula::DoubleVectorRefToken *> - (tmpCur_tmp); ss << " tmp"<<i<<"="; ss << vSubArguments[i]->GenSlidingWindowDeclRef()<<";\n"; ss << " if(isNan(tmp"<<i<<"))\n"; @@ -267,9 +256,6 @@ void OpDmin::GenSlidingWindowFunction(std::stringstream &ss, throw Unhandled(); formula::FormulaToken *tmpCur_tmp = vSubArguments[i]->GetFormulaToken(); - const formula::DoubleVectorRefToken*pCurDVR_tmp= - dynamic_cast<const formula::DoubleVectorRefToken *> - (tmpCur_tmp); ss << " tmp"<<i<<"="; ss << vSubArguments[i]->GenSlidingWindowDeclRef()<<";\n"; ss << " if(!isNan(tmp"<<i<<")){\n"; @@ -386,9 +372,6 @@ void OpDproduct::GenSlidingWindowFunction(std::stringstream &ss, throw Unhandled(); formula::FormulaToken *tmpCur_tmp = vSubArguments[i]->GetFormulaToken(); - const formula::DoubleVectorRefToken*pCurDVR_tmp= - dynamic_cast<const formula::DoubleVectorRefToken *> - (tmpCur_tmp); ss << " tmp"<<i<<"="; ss << vSubArguments[i]->GenSlidingWindowDeclRef()<<";\n"; ss << " if(isNan(tmp"<<i<<"))\n"; @@ -407,9 +390,6 @@ void OpDproduct::GenSlidingWindowFunction(std::stringstream &ss, throw Unhandled(); formula::FormulaToken *tmpCur_tmp = vSubArguments[i]->GetFormulaToken(); - const formula::DoubleVectorRefToken*pCurDVR_tmp= - dynamic_cast<const formula::DoubleVectorRefToken *> - (tmpCur_tmp); ss << " tmp"<<i<<"="; ss << vSubArguments[i]->GenSlidingWindowDeclRef()<<";\n"; ss << " if(!isNan(tmp"<<i<<")){\n"; @@ -527,9 +507,6 @@ void OpDaverage::GenSlidingWindowFunction(std::stringstream &ss, throw Unhandled(); formula::FormulaToken *tmpCur_tmp = vSubArguments[i]->GetFormulaToken(); - const formula::DoubleVectorRefToken*pCurDVR_tmp= - dynamic_cast<const formula::DoubleVectorRefToken *> - (tmpCur_tmp); ss << " tmp"<<i<<"="; ss << vSubArguments[i]->GenSlidingWindowDeclRef()<<";\n"; ss << " if(isNan(tmp"<<i<<"))\n"; @@ -548,9 +525,6 @@ void OpDaverage::GenSlidingWindowFunction(std::stringstream &ss, throw Unhandled(); formula::FormulaToken *tmpCur_tmp = vSubArguments[i]->GetFormulaToken(); - const formula::DoubleVectorRefToken*pCurDVR_tmp= - dynamic_cast<const formula::DoubleVectorRefToken *> - (tmpCur_tmp); ss << " tmp"<<i<<"="; ss << vSubArguments[i]->GenSlidingWindowDeclRef()<<";\n"; ss << " if(!isNan(tmp"<<i<<")){\n"; @@ -672,9 +646,6 @@ void OpDstdev::GenSlidingWindowFunction(std::stringstream &ss, throw Unhandled(); formula::FormulaToken *tmpCur_tmp = vSubArguments[i]->GetFormulaToken(); - const formula::DoubleVectorRefToken*pCurDVR_tmp= - dynamic_cast<const formula::DoubleVectorRefToken *> - (tmpCur_tmp); ss << " tmp"<<i<<"="; ss << vSubArguments[i]->GenSlidingWindowDeclRef()<<";\n"; ss << " if(isNan(tmp"<<i<<"))\n"; @@ -693,9 +664,6 @@ void OpDstdev::GenSlidingWindowFunction(std::stringstream &ss, throw Unhandled(); formula::FormulaToken *tmpCur_tmp = vSubArguments[i]->GetFormulaToken(); - const formula::DoubleVectorRefToken*pCurDVR_tmp= - dynamic_cast<const formula::DoubleVectorRefToken *> - (tmpCur_tmp); ss << " tmp"<<i<<"="; ss << vSubArguments[i]->GenSlidingWindowDeclRef()<<";\n"; ss << " if(!isNan(tmp"<<i<<")){\n"; @@ -733,9 +701,6 @@ void OpDstdev::GenSlidingWindowFunction(std::stringstream &ss, throw Unhandled(); formula::FormulaToken *tmpCur_tmp = vSubArguments[i]->GetFormulaToken(); - const formula::DoubleVectorRefToken*pCurDVR_tmp= - dynamic_cast<const formula::DoubleVectorRefToken *> - (tmpCur_tmp); ss << " tmp"<<i<<"="; ss << vSubArguments[i]->GenSlidingWindowDeclRef()<<";\n"; ss << " if(isNan(tmp"<<i<<"))\n"; @@ -754,9 +719,6 @@ void OpDstdev::GenSlidingWindowFunction(std::stringstream &ss, throw Unhandled(); formula::FormulaToken *tmpCur_tmp = vSubArguments[i]->GetFormulaToken(); - const formula::DoubleVectorRefToken*pCurDVR_tmp= - dynamic_cast<const formula::DoubleVectorRefToken *> - (tmpCur_tmp); ss << " tmp"<<i<<"="; ss << vSubArguments[i]->GenSlidingWindowDeclRef()<<";\n"; ss << " if(!isNan(tmp"<<i<<")){\n"; @@ -877,9 +839,6 @@ void OpDstdevp::GenSlidingWindowFunction(std::stringstream &ss, throw Unhandled(); formula::FormulaToken *tmpCur_tmp = vSubArguments[i]->GetFormulaToken(); - const formula::DoubleVectorRefToken*pCurDVR_tmp= - dynamic_cast<const formula::DoubleVectorRefToken *> - (tmpCur_tmp); ss << " tmp"<<i<<"="; ss << vSubArguments[i]->GenSlidingWindowDeclRef()<<";\n"; ss << " if(isNan(tmp"<<i<<"))\n"; @@ -898,9 +857,6 @@ void OpDstdevp::GenSlidingWindowFunction(std::stringstream &ss, throw Unhandled(); formula::FormulaToken *tmpCur_tmp = vSubArguments[i]->GetFormulaToken(); - const formula::DoubleVectorRefToken*pCurDVR_tmp= - dynamic_cast<const formula::DoubleVectorRefToken *> - (tmpCur_tmp); ss << " tmp"<<i<<"="; ss << vSubArguments[i]->GenSlidingWindowDeclRef()<<";\n"; ss << " if(!isNan(tmp"<<i<<")){\n"; @@ -938,9 +894,6 @@ void OpDstdevp::GenSlidingWindowFunction(std::stringstream &ss, throw Unhandled(); formula::FormulaToken *tmpCur_tmp = vSubArguments[i]->GetFormulaToken(); - const formula::DoubleVectorRefToken*pCurDVR_tmp= - dynamic_cast<const formula::DoubleVectorRefToken *> - (tmpCur_tmp); ss << " tmp"<<i<<"="; ss << vSubArguments[i]->GenSlidingWindowDeclRef()<<";\n"; ss << " if(isNan(tmp"<<i<<"))\n"; @@ -959,9 +912,6 @@ void OpDstdevp::GenSlidingWindowFunction(std::stringstream &ss, throw Unhandled(); formula::FormulaToken *tmpCur_tmp = vSubArguments[i]->GetFormulaToken(); - const formula::DoubleVectorRefToken*pCurDVR_tmp= - dynamic_cast<const formula::DoubleVectorRefToken *> - (tmpCur_tmp); ss << " tmp"<<i<<"="; ss << vSubArguments[i]->GenSlidingWindowDeclRef()<<";\n"; ss << " if(!isNan(tmp"<<i<<")){\n"; @@ -1080,9 +1030,6 @@ void OpDsum::GenSlidingWindowFunction(std::stringstream &ss, throw Unhandled(); formula::FormulaToken *tmpCur_tmp = vSubArguments[i]->GetFormulaToken(); - const formula::DoubleVectorRefToken*pCurDVR_tmp= - dynamic_cast<const formula::DoubleVectorRefToken *> - (tmpCur_tmp); ss << " tmp"<<i<<"="; ss << vSubArguments[i]->GenSlidingWindowDeclRef()<<";\n"; ss << " if(isNan(tmp"<<i<<"))\n"; @@ -1101,9 +1048,6 @@ void OpDsum::GenSlidingWindowFunction(std::stringstream &ss, throw Unhandled(); formula::FormulaToken *tmpCur_tmp = vSubArguments[i]->GetFormulaToken(); - const formula::DoubleVectorRefToken*pCurDVR_tmp= - dynamic_cast<const formula::DoubleVectorRefToken *> - (tmpCur_tmp); ss << " tmp"<<i<<"="; ss << vSubArguments[i]->GenSlidingWindowDeclRef()<<";\n"; ss << " if(!isNan(tmp"<<i<<")){\n"; @@ -1222,9 +1166,6 @@ void OpDvar::GenSlidingWindowFunction(std::stringstream &ss, throw Unhandled(); formula::FormulaToken *tmpCur_tmp = vSubArguments[i]->GetFormulaToken(); - const formula::DoubleVectorRefToken*pCurDVR_tmp= - dynamic_cast<const formula::DoubleVectorRefToken *> - (tmpCur_tmp); ss << " tmp"<<i<<"="; ss << vSubArguments[i]->GenSlidingWindowDeclRef()<<";\n"; ss << " if(isNan(tmp"<<i<<"))\n"; @@ -1243,9 +1184,6 @@ void OpDvar::GenSlidingWindowFunction(std::stringstream &ss, throw Unhandled(); formula::FormulaToken *tmpCur_tmp = vSubArguments[i]->GetFormulaToken(); - const formula::DoubleVectorRefToken*pCurDVR_tmp= - dynamic_cast<const formula::DoubleVectorRefToken *> - (tmpCur_tmp); ss << " tmp"<<i<<"="; ss << vSubArguments[i]->GenSlidingWindowDeclRef()<<";\n"; ss << " if(!isNan(tmp"<<i<<")){\n"; @@ -1283,9 +1221,6 @@ void OpDvar::GenSlidingWindowFunction(std::stringstream &ss, throw Unhandled(); formula::FormulaToken *tmpCur_tmp = vSubArguments[i]->GetFormulaToken(); - const formula::DoubleVectorRefToken*pCurDVR_tmp= - dynamic_cast<const formula::DoubleVectorRefToken *> - (tmpCur_tmp); ss << " tmp"<<i<<"="; ss << vSubArguments[i]->GenSlidingWindowDeclRef()<<";\n"; ss << " if(isNan(tmp"<<i<<"))\n"; @@ -1304,9 +1239,6 @@ void OpDvar::GenSlidingWindowFunction(std::stringstream &ss, throw Unhandled(); formula::FormulaToken *tmpCur_tmp = vSubArguments[i]->GetFormulaToken(); - const formula::DoubleVectorRefToken*pCurDVR_tmp= - dynamic_cast<const formula::DoubleVectorRefToken *> - (tmpCur_tmp); ss << " tmp"<<i<<"="; ss << vSubArguments[i]->GenSlidingWindowDeclRef()<<";\n"; ss << " if(!isNan(tmp"<<i<<")){\n"; @@ -1427,9 +1359,6 @@ void OpDvarp::GenSlidingWindowFunction(std::stringstream &ss, throw Unhandled(); formula::FormulaToken *tmpCur_tmp = vSubArguments[i]->GetFormulaToken(); - const formula::DoubleVectorRefToken*pCurDVR_tmp= - dynamic_cast<const formula::DoubleVectorRefToken *> - (tmpCur_tmp); ss << " tmp"<<i<<"="; ss << vSubArguments[i]->GenSlidingWindowDeclRef()<<";\n"; ss << " if(isNan(tmp"<<i<<"))\n"; @@ -1448,9 +1377,6 @@ void OpDvarp::GenSlidingWindowFunction(std::stringstream &ss, throw Unhandled(); formula::FormulaToken *tmpCur_tmp = vSubArguments[i]->GetFormulaToken(); - const formula::DoubleVectorRefToken*pCurDVR_tmp= - dynamic_cast<const formula::DoubleVectorRefToken *> - (tmpCur_tmp); ss << " tmp"<<i<<"="; ss << vSubArguments[i]->GenSlidingWindowDeclRef()<<";\n"; ss << " if(!isNan(tmp"<<i<<")){\n"; @@ -1488,9 +1414,6 @@ void OpDvarp::GenSlidingWindowFunction(std::stringstream &ss, throw Unhandled(); formula::FormulaToken *tmpCur_tmp = vSubArguments[i]->GetFormulaToken(); - const formula::DoubleVectorRefToken*pCurDVR_tmp= - dynamic_cast<const formula::DoubleVectorRefToken *> - (tmpCur_tmp); ss << " tmp"<<i<<"="; ss << vSubArguments[i]->GenSlidingWindowDeclRef()<<";\n"; ss << " if(isNan(tmp"<<i<<"))\n"; @@ -1509,9 +1432,6 @@ void OpDvarp::GenSlidingWindowFunction(std::stringstream &ss, throw Unhandled(); formula::FormulaToken *tmpCur_tmp = vSubArguments[i]->GetFormulaToken(); - const formula::DoubleVectorRefToken*pCurDVR_tmp= - dynamic_cast<const formula::DoubleVectorRefToken *> - (tmpCur_tmp); ss << " tmp"<<i<<"="; ss << vSubArguments[i]->GenSlidingWindowDeclRef()<<";\n"; ss << " if(!isNan(tmp"<<i<<")){\n"; @@ -1630,9 +1550,6 @@ void OpDcount::GenSlidingWindowFunction(std::stringstream &ss, throw Unhandled(); formula::FormulaToken *tmpCur_tmp = vSubArguments[i]->GetFormulaToken(); - const formula::DoubleVectorRefToken*pCurDVR_tmp= - dynamic_cast<const formula::DoubleVectorRefToken *> - (tmpCur_tmp); ss << " tmp"<<i<<"="; ss << vSubArguments[i]->GenSlidingWindowDeclRef()<<";\n"; ss << " if(isNan(tmp"<<i<<"))\n"; @@ -1651,9 +1568,6 @@ void OpDcount::GenSlidingWindowFunction(std::stringstream &ss, throw Unhandled(); formula::FormulaToken *tmpCur_tmp = vSubArguments[i]->GetFormulaToken(); - const formula::DoubleVectorRefToken*pCurDVR_tmp= - dynamic_cast<const formula::DoubleVectorRefToken *> - (tmpCur_tmp); ss << " tmp"<<i<<"="; ss << vSubArguments[i]->GenSlidingWindowDeclRef()<<";\n"; ss << " if(!isNan(tmp"<<i<<")){\n"; @@ -1771,9 +1685,6 @@ void OpDcount2::GenSlidingWindowFunction(std::stringstream &ss, throw Unhandled(); formula::FormulaToken *tmpCur_tmp = vSubArguments[i]->GetFormulaToken(); - const formula::DoubleVectorRefToken*pCurDVR_tmp= - dynamic_cast<const formula::DoubleVectorRefToken *> - (tmpCur_tmp); ss << " tmp"<<i<<"="; ss << vSubArguments[i]->GenSlidingWindowDeclRef()<<";\n"; ss << " if(isNan(tmp"<<i<<"))\n"; @@ -1792,9 +1703,6 @@ void OpDcount2::GenSlidingWindowFunction(std::stringstream &ss, throw Unhandled(); formula::FormulaToken *tmpCur_tmp = vSubArguments[i]->GetFormulaToken(); - const formula::DoubleVectorRefToken*pCurDVR_tmp= - dynamic_cast<const formula::DoubleVectorRefToken *> - (tmpCur_tmp); ss << " tmp"<<i<<"="; ss << vSubArguments[i]->GenSlidingWindowDeclRef()<<";\n"; ss << " if(!isNan(tmp"<<i<<")){\n"; diff --git a/sc/source/core/opencl/op_math.cxx b/sc/source/core/opencl/op_math.cxx index 0df3837dc81b..3958781a6512 100644 --- a/sc/source/core/opencl/op_math.cxx +++ b/sc/source/core/opencl/op_math.cxx @@ -2539,8 +2539,6 @@ void OpCeil::GenSlidingWindowFunction(std::stringstream &ss, ss << " double significance = " << GetBottom() << ";\n"; ss << " double bAbs = 0;\n"; #ifdef ISNAN - FormulaToken *iNum = vSubArguments[0]->GetFormulaToken(); - FormulaToken *iSignificance = vSubArguments[1]->GetFormulaToken(); ss << " if(isNan("; ss << vSubArguments[0]->GenSlidingWindowDeclRef() << "))\n"; ss << " num = " << GetBottom() << ";\n"; @@ -2615,10 +2613,6 @@ void OpKombin::GenSlidingWindowFunction(std::stringstream &ss, iNumChosen->GetType() == formula::svSingleVectorRef) { #ifdef ISNAN - const formula::SingleVectorRefToken* tmpCurDVRNum= - dynamic_cast<const formula::SingleVectorRefToken *>(iNum); - const formula::SingleVectorRefToken* tmpCurDVRNumChosen= - dynamic_cast<const formula::SingleVectorRefToken *>(iNumChosen); ss << " if(isNan("; ss << vSubArguments[0]->GenSlidingWindowDeclRef() << "))\n"; ss << " num = " << GetBottom() << ";\n"; @@ -2862,7 +2856,6 @@ void OpAverageIf::GenSlidingWindowFunction(std::stringstream &ss, ss << " int doubleIndex =i;\n"; } ss << " int singleIndex =gid0;\n"; - int m = 0; CheckSubArgumentIsNan(ss,vSubArguments,0); CheckSubArgumentIsNan(ss,vSubArguments,1); ss << " if ( isequal( tmp0 , tmp1 ) ) \n"; @@ -3022,8 +3015,6 @@ void OpQuotient::GenSlidingWindowFunction(std::stringstream &ss, ss << " double num1 = 1.0;\n"; ss << " double num2 = 1.0;\n"; #ifdef ISNAN - FormulaToken *iNum1 = vSubArguments[0]->GetFormulaToken(); - FormulaToken *iNum2 = vSubArguments[1]->GetFormulaToken(); ss << " if(isNan("; ss << vSubArguments[0]->GenSlidingWindowDeclRef() << "))\n"; ss << " num1 = 1.0;\n"; diff --git a/sc/source/core/opencl/op_statistical.cxx b/sc/source/core/opencl/op_statistical.cxx index 44d9cf3cbf10..0c2da2492307 100644 --- a/sc/source/core/opencl/op_statistical.cxx +++ b/sc/source/core/opencl/op_statistical.cxx @@ -4273,7 +4273,6 @@ void OpGeoMean::GenSlidingWindowFunction( ss << " int p1 = loopOffset + lidx + offset, p2 = p1 + 256;\n"; ss << " if (p2 < min(offset + windowSize, arrayLength)) {\n"; ss << " tmp0 = 0.0;\n"; - int mm=0; std::string p1 = "p1"; std::string p2 = "p2"; |