ForkMaster/smesh
1
0
Fork 0
mirror of https://git.salome-platform.org/gitpub/modules/smesh.git synced 2024-12-26 09:20:34 +05:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into V8_5_BR

Browse Source
This commit is contained in:
rnv 2018-04-23 19:06:30 +03:00
commit ad3cb4c938
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/SMDS/SMDS_Mesh.cxx
View File

@ -1831,6 +1831,7 @@ void SMDS_Mesh::RemoveElement(const SMDS_MeshElement * elem,
case SMDSAbs_All: // avoid compilation warning
case SMDSAbs_NbElementTypes: break;
}
removedElems.push_back( *it);
myCellFactory->Free( static_cast< const SMDS_MeshCell*>( *it ));

2
src/SMESH_I/SMESH_2smeshpy.cxx
View File

@ -5130,7 +5130,7 @@ int _pyStringFamily::isIn( const char* str )
if (( len = itSub->isIn( str + itSub->_prefix.Length() )) >= 0 )
return itSub->_prefix.Length() + len;
}
else if ( cmp > 0 )
else if ( cmp < 0 )
break;
}
if ( !_strings.empty() )