kindred/create
1
1
Fork 0
Code Issues 30 Pull Requests Actions Packages Projects 9 Releases 2 Wiki Activity

salomesmesh: fix broken conditions

Browse Source 
Warnings was:
src/3rdParty/salomesmesh/src/SMESH/SMESH_Mesh.cpp|617 col 19| warning: logical not is only applied to the left hand side of this comparison [-Wlogical-not-parentheses]
||   bool isAlgo = ( !anHyp->GetType() == SMESHDS_Hypothesis::PARAM_ALGO );
||                   ^                 ~~
src/3rdParty/salomesmesh/src/Controls/SMESH_Controls.cpp|2165 col 31| warning: '&&' within '||' [-Wlogical-op-parentheses]
||       if ( !aMinStr.IsEmpty() && !aMinStr.IsIntegerValue() ||
This commit is contained in:
Alexander Golubev
2015-05-17 18:16:01 +03:00
committed by wmayer
parent 09c7179389
commit 75ce52f6b8
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/3rdParty/salomesmesh/src/Controls/SMESH_Controls.cpp vendored
View File

@@ -3291,4 +3291,4 @@ std::vector<gp_XYZ>::reference TSequenceOfXYZ::operator()(size_type n)
std::vector<gp_XYZ>::const_reference TSequenceOfXYZ::operator()(size_type n) const
{
return std::vector<gp_XYZ>::operator[](n-1);
}
}

4
src/3rdParty/salomesmesh/src/SMESH/SMESH_Mesh.cpp vendored
View File

@@ -527,7 +527,7 @@ SMESH_Hypothesis::Hypothesis_Status
// shape
bool isAlgo = ( !anHyp->GetType() == SMESHDS_Hypothesis::PARAM_ALGO );
bool isAlgo = ( anHyp->GetType() != SMESHDS_Hypothesis::PARAM_ALGO );
int event = isAlgo ? SMESH_subMesh::ADD_ALGO : SMESH_subMesh::ADD_HYP;
SMESH_Hypothesis::Hypothesis_Status ret = subMesh->AlgoStateEngine(event, anHyp);
@@ -614,7 +614,7 @@ SMESH_Hypothesis::Hypothesis_Status
// shape
bool isAlgo = ( !anHyp->GetType() == SMESHDS_Hypothesis::PARAM_ALGO );
bool isAlgo = ( anHyp->GetType() != SMESHDS_Hypothesis::PARAM_ALGO );
int event = isAlgo ? SMESH_subMesh::REMOVE_ALGO : SMESH_subMesh::REMOVE_HYP;
SMESH_Hypothesis::Hypothesis_Status ret = subMesh->AlgoStateEngine(event, anHyp);