suzanne.soy/FreeCAD
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

+ fix 'switch' warnings

Browse Source
This commit is contained in:
wmayer 2015-08-29 22:26:48 +02:00
parent f7eb1ef924
commit 13fa571c41
1 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/Mod/Spreadsheet/App/Expression.cpp
View File

@ -111,7 +111,7 @@ bool Path::operator <(const Path &other) const
if (components.size() > other.components.size()) if (components.size() > other.components.size())
return false; return false;
for (int i = 0; i < components.size(); ++i) { for (std::size_t i = 0; i < components.size(); ++i) {
if (components[i].component < other.components[i].component) if (components[i].component < other.components[i].component)
return true; return true;
if (components[i].component > other.components[i].component) if (components[i].component > other.components[i].component)
@ -448,8 +448,8 @@ TYPESYSTEM_SOURCE(Spreadsheet::OperatorExpression, Spreadsheet::Expression);
OperatorExpression::OperatorExpression(const App::DocumentObject *_owner, Expression * _left, Operator _op, Expression * _right) OperatorExpression::OperatorExpression(const App::DocumentObject *_owner, Expression * _left, Operator _op, Expression * _right)
: UnitExpression(_owner) : UnitExpression(_owner)
, left(_left)
, op(_op) , op(_op)
, left(_left)
, right(_right) , right(_right)
{ {
@ -593,6 +593,8 @@ std::string OperatorExpression::toString() const
case POS: case POS:
s << "+"; s << "+";
break; break;
default:
break;
} }
if (left->priority() < priority()) if (left->priority() < priority())
@ -843,6 +845,8 @@ Expression * FunctionExpression::eval() const
if (first || value > q) if (first || value > q)
q = value; q = value;
break; break;
default:
break;
} }
first = false; first = false;
@ -858,6 +862,8 @@ Expression * FunctionExpression::eval() const
else else
q = (M2 / (n - 1.0)).pow(Quantity(0.5)); q = (M2 / (n - 1.0)).pow(Quantity(0.5));
break; break;
default:
break;
} }
return new NumberExpression(owner, q); return new NumberExpression(owner, q);
@ -1054,6 +1060,7 @@ Expression *FunctionExpression::simplify() const
case ATAN2: case ATAN2:
case MOD: case MOD:
case POW: case POW:
{
Expression * v2 = args[1]->simplify(); Expression * v2 = args[1]->simplify();
if (freecad_dynamic_cast<NumberExpression>(v2)) { if (freecad_dynamic_cast<NumberExpression>(v2)) {
@ -1068,6 +1075,9 @@ Expression *FunctionExpression::simplify() const
return new FunctionExpression(owner, f, a); return new FunctionExpression(owner, f, a);
} }
} }
default:
break;
}
delete v1; delete v1;
return eval(); return eval();
} }