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_Deflection1D.cxx
diff --git
a/src/StdMeshers/StdMeshers_Deflection1D.cxx
b/src/StdMeshers/StdMeshers_Deflection1D.cxx
index cf8223cd84e0cca35afc4ed0b3cfefca1c51a357..6181e8cbf2c9e742d2cdaaed52490592ecd45b0e 100644
(file)
--- a/
src/StdMeshers/StdMeshers_Deflection1D.cxx
+++ b/
src/StdMeshers/StdMeshers_Deflection1D.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
@@
-119,7
+119,7
@@
ostream & StdMeshers_Deflection1D::SaveTo(ostream & save)
istream & StdMeshers_Deflection1D::LoadFrom(istream & load)
{
istream & StdMeshers_Deflection1D::LoadFrom(istream & load)
{
- bool isOK = (load >> _value);
+ bool isOK =
static_cast<bool>
(load >> _value);
if (!isOK)
load.clear(ios::badbit | load.rdstate());
return load;
if (!isOK)
load.clear(ios::badbit | load.rdstate());
return load;
@@
-212,7
+212,7
@@
bool StdMeshers_Deflection1D::SetParametersByMesh(const SMESH_Mesh* theMesh,
if ( SMESH_Algo::GetNodeParamOnEdge( aMeshDS, edge, params ))
{
nbEdges++;
if ( SMESH_Algo::GetNodeParamOnEdge( aMeshDS, edge, params ))
{
nbEdges++;
- for (
in
t i = 1; i < params.size(); ++i )
+ for (
size_
t i = 1; i < params.size(); ++i )
_value = Max( _value, deflection( AdaptCurve, params[ i-1 ], params[ i ]));
}
}
_value = Max( _value, deflection( AdaptCurve, params[ i-1 ], params[ i ]));
}
}