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
23237: EDF 12367 - SIGSEGV with Remove group
[modules/smesh.git]
/
src
/
StdMeshers_I
/
StdMeshers_ImportSource2D_i.cxx
diff --git
a/src/StdMeshers_I/StdMeshers_ImportSource2D_i.cxx
b/src/StdMeshers_I/StdMeshers_ImportSource2D_i.cxx
index 545d98d018ef82f1b9b3e5f76e7683c564f2c0dc..051ae469ce548e78c58267067c2ccca0e1953774 100644
(file)
--- a/
src/StdMeshers_I/StdMeshers_ImportSource2D_i.cxx
+++ b/
src/StdMeshers_I/StdMeshers_ImportSource2D_i.cxx
@@
-1,4
+1,4
@@
-// Copyright (C) 2007-201
4
CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-201
5
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
@@
-90,7
+90,7
@@
void StdMeshers_ImportSource2D_i::SetSourceFaces(const SMESH::ListOfGroups& grou
std::vector<SMESH_Group*> smesh_groups;
std::vector<string> entries;
SALOMEDS::Study_var study = SMESH_Gen_i::GetSMESHGen()->GetCurrentStudy();
std::vector<SMESH_Group*> smesh_groups;
std::vector<string> entries;
SALOMEDS::Study_var study = SMESH_Gen_i::GetSMESHGen()->GetCurrentStudy();
- for (
int
i = 0; i < groups.length(); ++i )
+ for (
CORBA::ULong
i = 0; i < groups.length(); ++i )
if ( SMESH_GroupBase_i* gp_i = SMESH::DownCast<SMESH_GroupBase_i*>( groups[i] ))
{
if ( gp_i->GetType() != SMESH::FACE )
if ( SMESH_GroupBase_i* gp_i = SMESH::DownCast<SMESH_GroupBase_i*>( groups[i] ))
{
if ( gp_i->GetType() != SMESH::FACE )
@@
-109,7
+109,7
@@
void StdMeshers_ImportSource2D_i::SetSourceFaces(const SMESH::ListOfGroups& grou
_groupEntries = new SMESH::string_array;
_groupEntries->length( entries.size ());
_groupEntries = new SMESH::string_array;
_groupEntries->length( entries.size ());
- for (
in
t i = 0; i < entries.size(); ++i )
+ for (
size_
t i = 0; i < entries.size(); ++i )
_groupEntries[i] = entries[i].c_str();
}
catch ( SALOME_Exception& S_ex )
_groupEntries[i] = entries[i].c_str();
}
catch ( SALOME_Exception& S_ex )
@@
-173,7
+173,7
@@
char* StdMeshers_ImportSource2D_i::SaveTo()
os << " " << _groupEntries->length();
SALOMEDS::Study_var study = SMESH_Gen_i::GetSMESHGen()->GetCurrentStudy();
os << " " << _groupEntries->length();
SALOMEDS::Study_var study = SMESH_Gen_i::GetSMESHGen()->GetCurrentStudy();
- for (
int
i = 0; i < _groupEntries->length(); ++i )
+ for (
CORBA::ULong
i = 0; i < _groupEntries->length(); ++i )
{
// entry
os << " " << _groupEntries[i];
{
// entry
os << " " << _groupEntries[i];
@@
-210,7
+210,7
@@
void StdMeshers_ImportSource2D_i::LoadFrom( const char* theStream )
_groupEntries = new SMESH::string_array;
_groupEntries->length( nbGroups );
std::string id, entry;
_groupEntries = new SMESH::string_array;
_groupEntries->length( nbGroups );
std::string id, entry;
- for (
int
i = 0; i < _groupEntries->length(); ++i )
+ for (
CORBA::ULong
i = 0; i < _groupEntries->length(); ++i )
{
if ( is >> entry )
_groupEntries[i] = entry.c_str();
{
if ( is >> entry )
_groupEntries[i] = entry.c_str();