X-Git-Url: http://git.salome-platform.org/gitweb/?p=modules%2Fsmesh.git;a=blobdiff_plain;f=src%2FStdMeshers%2FStdMeshers_Geometric1D.cxx;h=33b091783985e0b21ca881ca7a118ff52eed1511;hp=eb50e45a95c3e4cf6f0a97c84d3a4e5aacd049aa;hb=41b3e4433388f439856c3b0bb3725e9c81179c24;hpb=7a65c9fad427b1ccba6b9ccae612296e5092a324 diff --git a/src/StdMeshers/StdMeshers_Geometric1D.cxx b/src/StdMeshers/StdMeshers_Geometric1D.cxx index eb50e45a9..33b091783 100644 --- a/src/StdMeshers/StdMeshers_Geometric1D.cxx +++ b/src/StdMeshers/StdMeshers_Geometric1D.cxx @@ -1,4 +1,4 @@ -// Copyright (C) 2007-2015 CEA/DEN, EDF R&D, OPEN CASCADE +// Copyright (C) 2007-2016 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 @@ -132,8 +132,8 @@ ostream & StdMeshers_Geometric1D::SaveTo(ostream & save) istream & StdMeshers_Geometric1D::LoadFrom(istream & load) { bool isOK = true; - isOK = (load >> _begLength); - isOK = (load >> _ratio); + isOK = static_cast(load >> _begLength); + isOK = static_cast(load >> _ratio); 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 ); - vector< double > params; + std::vector< double > params; if ( SMESH_Algo::GetNodeParamOnEdge( theMesh->GetMeshDS(), edge, params )) { nbEdges++;