Salome HOME
projects
/
modules
/
smesh.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' into pre/penta18
[modules/smesh.git]
/
src
/
StdMeshers
/
StdMeshers_ImportSource.cxx
diff --git
a/src/StdMeshers/StdMeshers_ImportSource.cxx
b/src/StdMeshers/StdMeshers_ImportSource.cxx
index aea04659506f929498b36809838e4442662737fc..0ee9c4b4130e3c4d3a657be6f6de35863f08739d 100644
(file)
--- a/
src/StdMeshers/StdMeshers_ImportSource.cxx
+++ b/
src/StdMeshers/StdMeshers_ImportSource.cxx
@@
-1,4
+1,4
@@
-// Copyright (C) 2007-201
4
CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-201
6
CEA/DEN, EDF R&D, OPEN CASCADE
//
// Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
//
// Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@
-125,14
+125,14
@@
namespace
bool loaded=false)
{
vector<SMESH_Group*> okGroups;
bool loaded=false)
{
vector<SMESH_Group*> okGroups;
- for (
in
t i = 0; i < groups.size(); ++i )
+ for (
size_
t i = 0; i < groups.size(); ++i )
{
try
{
// we expect SIGSEGV on a dead group
OCC_CATCH_SIGNALS;
SMESH_Group* okGroup = 0;
{
try
{
// we expect SIGSEGV on a dead group
OCC_CATCH_SIGNALS;
SMESH_Group* okGroup = 0;
- map<int, SMESH_Mesh*>::iterator itm =
itm =
studyContext->mapMesh.begin();
+ map<int, SMESH_Mesh*>::iterator itm = studyContext->mapMesh.begin();
for ( ; !okGroup && itm != studyContext->mapMesh.end(); itm++)
{
SMESH_Mesh::GroupIteratorPtr gIt = itm->second->GetGroups();
for ( ; !okGroup && itm != studyContext->mapMesh.end(); itm++)
{
SMESH_Mesh::GroupIteratorPtr gIt = itm->second->GetGroups();
@@
-174,7
+174,7
@@
namespace
{
int tgtID = resMapKey.second;
SMESH_Mesh* tgtMesh = 0;
{
int tgtID = resMapKey.second;
SMESH_Mesh* tgtMesh = 0;
- map<int, SMESH_Mesh*>::iterator itm =
itm =
studyContext->mapMesh.begin();
+ map<int, SMESH_Mesh*>::iterator itm = studyContext->mapMesh.begin();
for ( ; !tgtMesh && itm != studyContext->mapMesh.end(); itm++)
{
tgtMesh = (*itm).second;
for ( ; !tgtMesh && itm != studyContext->mapMesh.end(); itm++)
{
tgtMesh = (*itm).second;
@@
-250,7
+250,7
@@
std::vector<SMESH_Mesh*> StdMeshers_ImportSource1D::GetSourceMeshes() const
StudyContextStruct* studyContext = _gen->GetStudyContext(_studyId);
for ( set<int>::iterator id = meshIDs.begin(); id != meshIDs.end(); ++id )
{
StudyContextStruct* studyContext = _gen->GetStudyContext(_studyId);
for ( set<int>::iterator id = meshIDs.begin(); id != meshIDs.end(); ++id )
{
- map<int, SMESH_Mesh*>::iterator itm =
itm =
studyContext->mapMesh.begin();
+ map<int, SMESH_Mesh*>::iterator itm = studyContext->mapMesh.begin();
for ( ; itm != studyContext->mapMesh.end(); itm++)
{
SMESH_Mesh* mesh = (*itm).second;
for ( ; itm != studyContext->mapMesh.end(); itm++)
{
SMESH_Mesh* mesh = (*itm).second;
@@
-394,7
+394,7
@@
void StdMeshers_ImportSource1D::RestoreGroups(const std::vector<SMESH_Group*>& g
_groups = groups;
_resultGroups.clear();
_groups = groups;
_resultGroups.clear();
-
in
t i = 0;
+
size_
t i = 0;
while ( i < _resultGroupsStorage.size() )
{
int key1 = _resultGroupsStorage[i++];
while ( i < _resultGroupsStorage.size() )
{
int key1 = _resultGroupsStorage[i++];