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
bos #20256: [CEA 18523] Porting SMESH to int 64 bits
[modules/smesh.git]
/
src
/
SMESH_SWIG_WITHIHM
/
libSMESH_Swig.cxx
diff --git
a/src/SMESH_SWIG_WITHIHM/libSMESH_Swig.cxx
b/src/SMESH_SWIG_WITHIHM/libSMESH_Swig.cxx
index b15711998a4edb82d98cb10eaecf5325d9ce5eb9..cae25ae0e5ddb538acd529d895b300653c6961db 100644
(file)
--- a/
src/SMESH_SWIG_WITHIHM/libSMESH_Swig.cxx
+++ b/
src/SMESH_SWIG_WITHIHM/libSMESH_Swig.cxx
@@
-1739,7
+1739,7
@@
public:
if ( vw->SelectionMode() == ActorSelection )
return;
if ( vw->SelectionMode() == ActorSelection )
return;
-
TColStd_MapOfInteger
idMap;
+
SVTK_TVtkIDsMap
idMap;
std::vector<int>::const_iterator it;
for ( it = myIds.begin(); it != myIds.end(); ++it )
{
std::vector<int>::const_iterator it;
for ( it = myIds.begin(); it != myIds.end(); ++it )
{
@@
-1834,11
+1834,11
@@
public:
if ( vw->SelectionMode() != EdgeOfCellSelection )
return;
if ( vw->SelectionMode() != EdgeOfCellSelection )
return;
- SVTK_IndexedMapOfIds idMap;
+ SVTK_IndexedMapOf
Vtk
Ids idMap;
std::vector<std::pair<int, int> >::const_iterator it;
for ( it = myIds.begin(); it != myIds.end(); ++it )
{
std::vector<std::pair<int, int> >::const_iterator it;
for ( it = myIds.begin(); it != myIds.end(); ++it )
{
- std::vector<
int
> pair;
+ std::vector<
vtkIdType
> pair;
pair.push_back( (*it).first );
pair.push_back( (*it).second );
idMap.Add( pair );
pair.push_back( (*it).first );
pair.push_back( (*it).second );
idMap.Add( pair );
@@
-1991,11
+1991,11
@@
public:
if ( !actor || !actor->hasIO() )
return;
if ( !actor || !actor->hasIO() )
return;
-
TColStd_IndexedMapOfInteger
idMap;
+
SVTK_TIndexedMapOfVtkId
idMap;
selector->GetIndex( actor->getIO(), idMap );
for ( int i = 1; i <= idMap.Extent(); i++ )
selector->GetIndex( actor->getIO(), idMap );
for ( int i = 1; i <= idMap.Extent(); i++ )
- myResult.push_back( idMap( i ) );
+ myResult.push_back(
(int)
idMap( i ) );
}
};
}
};
@@
-2047,7
+2047,7
@@
public:
if ( !actor || !actor->hasIO() )
return;
if ( !actor || !actor->hasIO() )
return;
- SVTK_IndexedMapOfIds idMap;
+ SVTK_IndexedMapOf
Vtk
Ids idMap;
selector->GetCompositeIndex( actor->getIO(), idMap );
for ( int i = 1; i <= idMap.Extent(); i++ ) {
selector->GetCompositeIndex( actor->getIO(), idMap );
for ( int i = 1; i <= idMap.Extent(); i++ ) {