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

Enable C++0x/C++11 support

Browse Source
This commit is contained in:
vsr 2015-10-16 14:46:33 +04:00
parent 53a4f47393
commit a4216ec9d0
3 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/SMESH/SMESH_MeshEditor.cxx
View File

@ -8528,7 +8528,7 @@ SMESH_MeshEditor::SewFreeBorder (const SMDS_MeshNode* theBordFirstNode,
// sew the border to the side 2 // sew the border to the side 2
// ============================ // ============================
int nbNodes[] = { nSide[0].size(), nSide[1].size() }; int nbNodes[] = { (int)nSide[0].size(), (int)nSide[1].size() };
int maxNbNodes = Max( nbNodes[0], nbNodes[1] ); int maxNbNodes = Max( nbNodes[0], nbNodes[1] );
bool toMergeConformal = ( nbNodes[0] == nbNodes[1] ); bool toMergeConformal = ( nbNodes[0] == nbNodes[1] );

13
src/SMESH_I/SMESH_Gen_i.cxx
View File

@ -2585,6 +2585,7 @@ SMESH_Gen_i::ConcatenateCommon(const SMESH::ListOfIDSources& theMeshesArray,
aGroup = aListOfGroups[iG]; aGroup = aListOfGroups[iG];
aGroupType = aGroup->GetType(); aGroupType = aGroup->GetType();
aGroupName = aGroup->GetName(); aGroupName = aGroup->GetName();
string aName = aGroupName.in();
// convert a list of IDs // convert a list of IDs
anNewIDs->length( aGroup->Size() ); anNewIDs->length( aGroup->Size() );
@ -2602,15 +2603,15 @@ SMESH_Gen_i::ConcatenateCommon(const SMESH::ListOfIDSources& theMeshesArray,
// check a current group name and type don't have identical ones in final mesh // check a current group name and type don't have identical ones in final mesh
aListOfNewGroups.clear(); aListOfNewGroups.clear();
TGroupsMap::iterator anIter = aGroupsMap.find( make_pair( aGroupName, aGroupType )); TGroupsMap::iterator anIter = aGroupsMap.find( make_pair( aName, aGroupType ));
if ( anIter == aGroupsMap.end() ) { if ( anIter == aGroupsMap.end() ) {
// add a new group in the mesh // add a new group in the mesh
aNewGroup = aNewImpl->CreateGroup( aGroupType, aGroupName ); aNewGroup = aNewImpl->CreateGroup( aGroupType, aGroupName.in() );
// add elements into new group // add elements into new group
aNewGroup->Add( anNewIDs ); aNewGroup->Add( anNewIDs );
aListOfNewGroups.push_back(aNewGroup); aListOfNewGroups.push_back(aNewGroup);
aGroupsMap.insert(make_pair( make_pair(aGroupName, aGroupType), aListOfNewGroups )); aGroupsMap.insert(make_pair( make_pair(aName, aGroupType), aListOfNewGroups ));
} }
else if ( theUniteIdenticalGroups ) { else if ( theUniteIdenticalGroups ) {
@ -2621,18 +2622,18 @@ SMESH_Gen_i::ConcatenateCommon(const SMESH::ListOfIDSources& theMeshesArray,
else { else {
// rename identical groups // rename identical groups
aNewGroup = aNewImpl->CreateGroup(aGroupType, aGroupName); aNewGroup = aNewImpl->CreateGroup(aGroupType, aGroupName.in());
aNewGroup->Add( anNewIDs ); aNewGroup->Add( anNewIDs );
TListOfNewGroups& aNewGroups = anIter->second; TListOfNewGroups& aNewGroups = anIter->second;
string aNewGroupName; string aNewGroupName;
if (aNewGroups.size() == 1) { if (aNewGroups.size() == 1) {
aNewGroupName = string(aGroupName) + "_1"; aNewGroupName = aName + "_1";
aNewGroups.front()->SetName(aNewGroupName.c_str()); aNewGroups.front()->SetName(aNewGroupName.c_str());
} }
char aGroupNum[128]; char aGroupNum[128];
sprintf(aGroupNum, "%u", aNewGroups.size()+1); sprintf(aGroupNum, "%u", aNewGroups.size()+1);
aNewGroupName = string(aGroupName) + "_" + string(aGroupNum); aNewGroupName = aName + "_" + string(aGroupNum);
aNewGroup->SetName(aNewGroupName.c_str()); aNewGroup->SetName(aNewGroupName.c_str());
aNewGroups.push_back(aNewGroup); aNewGroups.push_back(aNewGroup);
} }

2
src/StdMeshers/StdMeshers_Cartesian_3D.cxx
View File

@ -3135,7 +3135,7 @@ namespace
if ( !_vIntNodes.empty() ) if ( !_vIntNodes.empty() )
return false; return false;
const int ijk[3] = { _i, _j, _k }; const size_t ijk[3] = { _i, _j, _k };
F_IntersectPoint curIntPnt; F_IntersectPoint curIntPnt;
// consider a cell to be in a hole if all links in any direction // consider a cell to be in a hole if all links in any direction