X-Git-Url: http://git.salome-platform.org/gitweb/?p=modules%2Fsmesh.git;a=blobdiff_plain;f=src%2FStdMeshers%2FStdMeshers_LocalLength.cxx;h=898d940f4ed19d14b6dfa7559b0aaa52112b755b;hp=a5712bdb07e3a67563999ed0b7c3d470effdadb3;hb=264eeb2edd6977ccf2d2bd88cbb210353f63f7c9;hpb=cfa45d551fd47dd3648dea6e50ac74329b0d9e5d diff --git a/src/StdMeshers/StdMeshers_LocalLength.cxx b/src/StdMeshers/StdMeshers_LocalLength.cxx index a5712bdb0..898d940f4 100644 --- a/src/StdMeshers/StdMeshers_LocalLength.cxx +++ b/src/StdMeshers/StdMeshers_LocalLength.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 @@ -52,8 +52,8 @@ using namespace std; */ //============================================================================= -StdMeshers_LocalLength::StdMeshers_LocalLength(int hypId, int studyId, SMESH_Gen * gen) - :SMESH_Hypothesis(hypId, studyId, gen) +StdMeshers_LocalLength::StdMeshers_LocalLength(int hypId, SMESH_Gen * gen) + :SMESH_Hypothesis(hypId, gen) { _length = 1.; _precision = Precision::Confusion(); @@ -148,13 +148,13 @@ istream & StdMeshers_LocalLength::LoadFrom(istream & load) bool isOK = true; double a; - isOK = (load >> a); + isOK = static_cast(load >> a); if (isOK) this->_length = a; else load.clear(ios::badbit | load.rdstate()); - isOK = (load >> a); + isOK = static_cast(load >> a); if (isOK) this->_precision = a; else @@ -224,7 +224,7 @@ bool StdMeshers_LocalLength::SetParametersByMesh(const SMESH_Mesh* theMesh, SMESHDS_Mesh* aMeshDS = const_cast< SMESH_Mesh* >( theMesh )->GetMeshDS(); if ( SMESH_Algo::GetNodeParamOnEdge( aMeshDS, edge, params )) { - for ( int i = 1; i < params.size(); ++i ) + for ( size_t i = 1; i < params.size(); ++i ) _length += GCPnts_AbscissaPoint::Length( AdaptCurve, params[ i-1 ], params[ i ]); nbEdges += params.size() - 1; }