X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FStdMeshers%2FStdMeshers_Deflection1D.cxx;h=87f0c0168f413cd98248f461020532fef129404f;hb=c9c3fe8924452af01274d358e5d6d391b1b27375;hp=5d2cfe8899e40f96203a35583a6d51f4a61d6f2b;hpb=251f8c052dd12dd29922210dc901b295fe999a0e;p=modules%2Fsmesh.git diff --git a/src/StdMeshers/StdMeshers_Deflection1D.cxx b/src/StdMeshers/StdMeshers_Deflection1D.cxx index 5d2cfe889..87f0c0168 100644 --- a/src/StdMeshers/StdMeshers_Deflection1D.cxx +++ b/src/StdMeshers/StdMeshers_Deflection1D.cxx @@ -1,4 +1,4 @@ -// Copyright (C) 2007-2015 CEA/DEN, EDF R&D, OPEN CASCADE +// Copyright (C) 2007-2019 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 StdMeshers_Deflection1D : implementaion of SMESH idl descriptions +// SMESH StdMeshers_Deflection1D : implementation of SMESH idl descriptions // File : StdMeshers_Deflection1D.cxx // Module : SMESH // @@ -50,9 +50,8 @@ using namespace std; //============================================================================= StdMeshers_Deflection1D::StdMeshers_Deflection1D(int hypId, - int studyId, SMESH_Gen * gen) - :SMESH_Hypothesis(hypId, studyId, gen) + :SMESH_Hypothesis(hypId, gen) { _value = 1.; _name = "Deflection1D"; @@ -119,7 +118,7 @@ ostream & StdMeshers_Deflection1D::SaveTo(ostream & save) istream & StdMeshers_Deflection1D::LoadFrom(istream & load) { - bool isOK = (load >> _value); + bool isOK = static_cast(load >> _value); if (!isOK) load.clear(ios::badbit | load.rdstate()); return load; @@ -212,7 +211,7 @@ bool StdMeshers_Deflection1D::SetParametersByMesh(const SMESH_Mesh* theMesh, if ( SMESH_Algo::GetNodeParamOnEdge( aMeshDS, edge, params )) { nbEdges++; - for ( int 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 ])); } }