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
Fix regressions
[modules/smesh.git]
/
src
/
StdMeshers
/
StdMeshers_Geometric1D.cxx
diff --git
a/src/StdMeshers/StdMeshers_Geometric1D.cxx
b/src/StdMeshers/StdMeshers_Geometric1D.cxx
index eb50e45a95c3e4cf6f0a97c84d3a4e5aacd049aa..33b091783985e0b21ca881ca7a118ff52eed1511 100644
(file)
--- a/
src/StdMeshers/StdMeshers_Geometric1D.cxx
+++ b/
src/StdMeshers/StdMeshers_Geometric1D.cxx
@@
-1,4
+1,4
@@
-// Copyright (C) 2007-201
5
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
@@
-132,8
+132,8
@@
ostream & StdMeshers_Geometric1D::SaveTo(ostream & save)
istream & StdMeshers_Geometric1D::LoadFrom(istream & load)
{
bool isOK = true;
istream & StdMeshers_Geometric1D::LoadFrom(istream & load)
{
bool isOK = true;
- isOK = (load >> _begLength);
- isOK = (load >> _ratio);
+ isOK =
static_cast<bool>
(load >> _begLength);
+ isOK =
static_cast<bool>
(load >> _ratio);
if (isOK)
StdMeshers_Reversible1D::LoadFrom( load );
if (isOK)
StdMeshers_Reversible1D::LoadFrom( load );
@@
-166,7
+166,7
@@
bool StdMeshers_Geometric1D::SetParametersByMesh(const SMESH_Mesh* theMesh,
const TopoDS_Edge& edge = TopoDS::Edge( edgeMap( i ));
BRepAdaptor_Curve C( edge );
const TopoDS_Edge& edge = TopoDS::Edge( edgeMap( i ));
BRepAdaptor_Curve C( edge );
- vector< double > params;
+
std::
vector< double > params;
if ( SMESH_Algo::GetNodeParamOnEdge( theMesh->GetMeshDS(), edge, params ))
{
nbEdges++;
if ( SMESH_Algo::GetNodeParamOnEdge( theMesh->GetMeshDS(), edge, params ))
{
nbEdges++;