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

+ fix warnings: -Wunused-private-field and -Wtautological-compare

Browse Source
This commit is contained in:
wmayer 2015-10-04 13:27:44 +02:00
parent c5246875b1
commit 3998bd7f98
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Mod/Mesh/App/Core/Triangulation.cpp
View File

@ -653,6 +653,8 @@ void FlatTriangulator::PostProcessing(const std::vector<Base::Vector3f>&)
ConstraintDelaunayTriangulator::ConstraintDelaunayTriangulator(float area)
: fMaxArea(area)
{
// silent warning: -Wunused-private-field
(void)fMaxArea;
}
ConstraintDelaunayTriangulator::~ConstraintDelaunayTriangulator()

6
src/Mod/Sketcher/App/PropertyConstraintList.cpp
View File

@ -421,7 +421,7 @@ void PropertyConstraintList::setPathValue(const ObjectIdentifier &path, const bo
throw std::bad_cast();
if (c0.isArray() && path.numSubComponents() == 1) {
if (c0.getIndex() < 0 || c0.getIndex() >= _lValueList.size())
if (c0.getIndex() >= _lValueList.size())
throw Base::Exception("Array out of bounds");
aboutToSetValue();
_lValueList[c0.getIndex()]->setValue(dvalue);
@ -448,7 +448,7 @@ const Constraint * PropertyConstraintList::getConstraint(const ObjectIdentifier
const ObjectIdentifier::Component & c0 = path.getPropertyComponent(0);
if (c0.isArray() && path.numSubComponents() == 1) {
if (c0.getIndex() < 0 || c0.getIndex() >= _lValueList.size())
if (c0.getIndex() >= _lValueList.size())
throw Base::Exception("Array out of bounds");
return _lValueList[c0.getIndex()];
@ -474,7 +474,7 @@ const ObjectIdentifier PropertyConstraintList::canonicalPath(const ObjectIdentif
const ObjectIdentifier::Component & c0 = p.getPropertyComponent(0);
if (c0.isArray() && p.numSubComponents() == 1) {
if (c0.getIndex() >= 0 && c0.getIndex() < _lValueList.size() && _lValueList[c0.getIndex()]->Name.size() > 0)
if (c0.getIndex() < _lValueList.size() && _lValueList[c0.getIndex()]->Name.size() > 0)
return ObjectIdentifier(getContainer()) << ObjectIdentifier::Component::SimpleComponent(getName())
<< ObjectIdentifier::Component::SimpleComponent(_lValueList[c0.getIndex()]->Name);
return p;