X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FStdMeshers%2FStdMeshers_Geometric1D.cxx;h=87514e2c9aea69233a7ce1d742aa6fb9e7930a2f;hb=80637e48ef0a19bb89acdf00c98959ab08b5dcc8;hp=35820dc4691d248cdc36e62fb62ecf5681cef6de;hpb=b0a908c0d20341651771d0249fb10882f54b2aad;p=modules%2Fsmesh.git diff --git a/src/StdMeshers/StdMeshers_Geometric1D.cxx b/src/StdMeshers/StdMeshers_Geometric1D.cxx index 35820dc46..87514e2c9 100644 --- a/src/StdMeshers/StdMeshers_Geometric1D.cxx +++ b/src/StdMeshers/StdMeshers_Geometric1D.cxx @@ -1,4 +1,4 @@ -// Copyright (C) 2007-2014 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 @@ -20,7 +20,7 @@ // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // -// SMESH SMESH : implementaion of SMESH idl descriptions +// SMESH SMESH : implementation of SMESH idl descriptions // File : StdMeshers_Geometric1D.cxx // Module : SMESH // @@ -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++;