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 'V8_4_BR'
[modules/smesh.git]
/
src
/
SMESHDS
/
SMESHDS_TSubMeshHolder.hxx
diff --git
a/src/SMESHDS/SMESHDS_TSubMeshHolder.hxx
b/src/SMESHDS/SMESHDS_TSubMeshHolder.hxx
index 52c9eb2c4ba9ada3315e23332504da861587d579..d637e7e16ba0a5a7c96427066d0c7e2935fe507b 100644
(file)
--- a/
src/SMESHDS/SMESHDS_TSubMeshHolder.hxx
+++ b/
src/SMESHDS/SMESHDS_TSubMeshHolder.hxx
@@
-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
@@
-54,7
+54,7
@@
public:
}
else
{
}
else
{
- if ( myVec.size() <= id )
+ if (
(int)
myVec.size() <= id )
myVec.resize( id+1, (SUBMESH*) NULL );
myVec[ id ] = sm;
}
myVec.resize( id+1, (SUBMESH*) NULL );
myVec[ id ] = sm;
}
@@
-68,7
+68,7
@@
public:
}
else
{
}
else
{
- return (SUBMESH*) ( id >= myVec.size() ? NULL : myVec[ id ]);
+ return (SUBMESH*) ( id >=
(int)
myVec.size() ? NULL : myVec[ id ]);
}
}
void DeleteAll()
}
}
void DeleteAll()